diff --git a/osc/conf.py b/osc/conf.py index 9b518f0b..07aa6f6c 100644 --- a/osc/conf.py +++ b/osc/conf.py @@ -158,7 +158,7 @@ DEFAULTS = {'apiurl': 'https://api.opensuse.org', # check for unversioned/removed files before commit 'check_filelist': '1', # check for pending requests after executing an action (e.g. checkout, update, commit) - 'check_for_request_on_action': '0', + 'check_for_request_on_action': '1', # what to do with the source package if the submitrequest has been accepted 'submitrequest_on_accept_action': '', 'request_show_interactive': '0', @@ -323,7 +323,7 @@ apiurl = %(apiurl)s #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used diff --git a/tests/addfile_fixtures/oscrc b/tests/addfile_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/addfile_fixtures/oscrc +++ b/tests/addfile_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/commit_fixtures/oscrc b/tests/commit_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/commit_fixtures/oscrc +++ b/tests/commit_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/commit_fixtures/testOpenRequests b/tests/commit_fixtures/testOpenRequests new file mode 100644 index 00000000..ecbb5b2b --- /dev/null +++ b/tests/commit_fixtures/testOpenRequests @@ -0,0 +1 @@ + diff --git a/tests/conf_fixtures/oscrc b/tests/conf_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/conf_fixtures/oscrc +++ b/tests/conf_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/deletefile_fixtures/oscrc b/tests/deletefile_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/deletefile_fixtures/oscrc +++ b/tests/deletefile_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/difffile_fixtures/oscrc b/tests/difffile_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/difffile_fixtures/oscrc +++ b/tests/difffile_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/init_package_fixtures/oscrc b/tests/init_package_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/init_package_fixtures/oscrc +++ b/tests/init_package_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/init_project_fixtures/oscrc b/tests/init_project_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/init_project_fixtures/oscrc +++ b/tests/init_project_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/prdiff_fixtures/oscrc b/tests/prdiff_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/prdiff_fixtures/oscrc +++ b/tests/prdiff_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/project_package_status_fixtures/oscrc b/tests/project_package_status_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/project_package_status_fixtures/oscrc +++ b/tests/project_package_status_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/repairwc_fixtures/oscrc b/tests/repairwc_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/repairwc_fixtures/oscrc +++ b/tests/repairwc_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/request_fixtures/oscrc b/tests/request_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/request_fixtures/oscrc +++ b/tests/request_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/results_fixtures/oscrc b/tests/results_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/results_fixtures/oscrc +++ b/tests/results_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/revertfile_fixtures/oscrc b/tests/revertfile_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/revertfile_fixtures/oscrc +++ b/tests/revertfile_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/setlinkrev_fixtures/oscrc b/tests/setlinkrev_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/setlinkrev_fixtures/oscrc +++ b/tests/setlinkrev_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate diff --git a/tests/test_commit.py b/tests/test_commit.py index 349fc4b4..3eb27406 100644 --- a/tests/test_commit.py +++ b/tests/test_commit.py @@ -31,6 +31,7 @@ class TestCommit(OscTestCase): exp='This file didn\'t change but\nis modified.\n', text=rev_dummy) @POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin', file='testSimple_cfilesremote', expfile='testSimple_lfilelist') + @GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27simple%27+or+action%2Fsource%2F%40package%3D%27simple%27%29', file='testOpenRequests') def test_simple(self): """a simple commit (only one modified file)""" self._change_to_pkg('simple') @@ -54,6 +55,7 @@ class TestCommit(OscTestCase): exp='added file\n', text=rev_dummy) @POST('http://localhost/source/osctest/add?comment=&cmd=commitfilelist&user=Admin', file='testAddfile_cfilesremote', expfile='testAddfile_lfilelist') + @GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27add%27+or+action%2Fsource%2F%40package%3D%27add%27%29', file='testOpenRequests') def test_addfile(self): """commit a new file""" self._change_to_pkg('add') @@ -75,6 +77,7 @@ class TestCommit(OscTestCase): exp='', text='') @POST('http://localhost/source/osctest/delete?comment=&cmd=commitfilelist&user=Admin&withvalidate=1', file='testDeletefile_cfilesremote', expfile='testDeletefile_lfilelist') + @GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27delete%27+or+action%2Fsource%2F%40package%3D%27delete%27%29', file='testOpenRequests') def test_deletefile(self): """delete a file""" self._change_to_pkg('delete') @@ -127,6 +130,7 @@ class TestCommit(OscTestCase): @PUT('http://localhost/source/osctest/multiple/add2?rev=repository', exp='add2\n', text=rev_dummy) @POST('http://localhost/source/osctest/multiple?comment=&cmd=commitfilelist&user=Admin', file='testMultiple_cfilesremote', expfile='testMultiple_lfilelist') + @GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27multiple%27+or+action%2Fsource%2F%40package%3D%27multiple%27%29', file='testOpenRequests') def test_multiple(self): """a simple commit (only one modified file)""" self._change_to_pkg('multiple') @@ -155,6 +159,7 @@ class TestCommit(OscTestCase): @PUT('http://localhost/source/osctest/multiple/nochange?rev=repository', exp='This file did change.\n', text=rev_dummy) @POST('http://localhost/source/osctest/multiple?comment=&cmd=commitfilelist&user=Admin', file='testPartial_cfilesremote', expfile='testPartial_lfilelist') + @GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27multiple%27+or+action%2Fsource%2F%40package%3D%27multiple%27%29', file='testOpenRequests') def test_partial(self): """commit only some files""" self._change_to_pkg('multiple') @@ -201,6 +206,7 @@ class TestCommit(OscTestCase): @PUT('http://localhost/source/osctest/allstates/nochange?rev=repository', exp='This file did change.\n', text=rev_dummy) @POST('http://localhost/source/osctest/allstates?comment=&cmd=commitfilelist&user=Admin', file='testAllStates_cfilesremote', expfile='testAllStates_lfilelist') + @GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27allstates%27+or+action%2Fsource%2F%40package%3D%27allstates%27%29', file='testOpenRequests') def test_allstates(self): """commit all files (all states are available except 'C')""" self._change_to_pkg('allstates') @@ -226,6 +232,7 @@ class TestCommit(OscTestCase): exp='', text='') @POST('http://localhost/source/osctest/add?comment=&cmd=commitfilelist&user=Admin&withvalidate=1', file='testAddfile_cfilesremote', expfile='testAddfile_lfilelist') + @GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27add%27+or+action%2Fsource%2F%40package%3D%27add%27%29', file='testOpenRequests') def test_remoteexists(self): """file 'add' should be committed but already exists on the server""" self._change_to_pkg('add') @@ -251,6 +258,7 @@ class TestCommit(OscTestCase): @POST('http://localhost/source/osctest/branch?comment=&cmd=commitfilelist&user=Admin&keeplink=1', file='testExpand_cfilesremote', expfile='testExpand_lfilelist') @GET('http://localhost/source/osctest/branch?rev=87ea02aede261b0267aabaa97c756e7a', file='testExpand_expandedfilesremote') + @GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27branch%27+or+action%2Fsource%2F%40package%3D%27branch%27%29', file='testOpenRequests') def test_expand(self): """commit an expanded package""" self._change_to_pkg('branch') @@ -282,6 +290,7 @@ class TestCommit(OscTestCase): @PUT('http://localhost/source/osctest/added_missing/bar?rev=repository', exp='foobar\n', text=rev_dummy) @POST('http://localhost/source/osctest/added_missing?comment=&cmd=commitfilelist&user=Admin', file='testAddedMissing_cfilesremote', expfile='testAddedMissing_lfilelist') + @GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27added_missing%27+or+action%2Fsource%2F%40package%3D%27added_missing%27%29', file='testOpenRequests') def test_added_missing2(self): """commit an added file, another added file missing (but it's not part of the commit)""" self._change_to_pkg('added_missing') @@ -323,6 +332,7 @@ class TestCommit(OscTestCase): exp='This file didn\'t change but\nis modified.\n', text=rev_dummy) @POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin', file='testSimple_cfilesremote', expfile='testSimple_lfilelistwithSHA') + @GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27simple%27+or+action%2Fsource%2F%40package%3D%27simple%27%29', file='testOpenRequests') def test_simple_sha256(self): """a simple commit (only one modified file)""" self._change_to_pkg('simple') @@ -347,6 +357,7 @@ class TestCommit(OscTestCase): @PUT('http://localhost/source/osctest/added_missing/bar?rev=repository', exp='foobar\n', text=rev_dummy) @POST('http://localhost/source/osctest/added_missing?comment=&cmd=commitfilelist&user=Admin', file='testAddedMissing_cfilesremote', expfile='testAddedMissing_lfilelistwithSHA') + @GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27added_missing%27+or+action%2Fsource%2F%40package%3D%27added_missing%27%29', file='testOpenRequests') def test_added_missing2_sha256(self): """commit an added file, another added file missing (but it's not part of the commit)""" self._change_to_pkg('added_missing') diff --git a/tests/update_fixtures/oscrc b/tests/update_fixtures/oscrc index a30e040c..4acb8472 100644 --- a/tests/update_fixtures/oscrc +++ b/tests/update_fixtures/oscrc @@ -80,7 +80,7 @@ apiurl = http://localhost # check for unversioned/removed files before commit #check_filelist = 1 # check for pending requests after executing an action (e.g. checkout, update, commit) -#check_for_request_on_action = 0 +#check_for_request_on_action = 1 # what to do with the source package if the submitrequest has been accepted. If # nothing is specified the API default is used #submitrequest_on_accept_action = cleanup|update|noupdate