| |
@@ -132,172 +132,225 @@
|
| |
# should exit 1
|
| |
assert excinfo.value.code == 1
|
| |
|
| |
- @pytest.mark.parametrize(
|
| |
- "target",
|
| |
- # update ID or task ID (to test both paths)
|
| |
- ['FEDORA-2017-b07d628952', '32099714']
|
| |
- )
|
| |
- @mock.patch('fedora_openqa.schedule.jobs_from_update', return_value=[1, 2], autospec=True)
|
| |
- def test_command_update_task(fakejfu, target, capsys):
|
| |
- """Test the command_update_task function."""
|
| |
- if target.isdigit():
|
| |
- targetarg = 'task'
|
| |
- else:
|
| |
- targetarg = 'update'
|
| |
- args = cli.parse_args(
|
| |
- [targetarg, target, '25']
|
| |
- )
|
| |
- with pytest.raises(SystemExit) as excinfo:
|
| |
- cli.command_update_task(args)
|
| |
- (out, _) = capsys.readouterr()
|
| |
- # first arg should be target
|
| |
- assert fakejfu.call_args[0][0] == target
|
| |
- # second should be release
|
| |
- assert fakejfu.call_args[0][1] == 25
|
| |
- # flavors kwarg should be false-y (not, e.g., [None])
|
| |
- assert not fakejfu.call_args[1]['flavors']
|
| |
- # should print out list of scheduled jobs
|
| |
- assert out == "Scheduled jobs: 1, 2\n"
|
| |
- # should exit 0
|
| |
- assert not excinfo.value.code
|
| |
- # shouldn't force
|
| |
- assert fakejfu.call_args[1]['force'] is False
|
| |
|
| |
- # check 'flavor'
|
| |
- args = cli.parse_args(
|
| |
- ['update', target, '25', '--flavor', 'server']
|
| |
+ class TestCommandUpdateTask:
|
| |
+ """Tests for the command_update_task function."""
|
| |
+ @pytest.mark.parametrize(
|
| |
+ "target",
|
| |
+ # update ID or task ID (to test both paths)
|
| |
+ ['FEDORA-2017-b07d628952', '32099714']
|
| |
)
|
| |
- with pytest.raises(SystemExit) as excinfo:
|
| |
- cli.command_update_task(args)
|
| |
- # should exit 0
|
| |
- assert not excinfo.value.code
|
| |
- assert fakejfu.call_args[1]['flavors'] == ['server']
|
| |
+ @mock.patch('fedora_openqa.schedule.jobs_from_update', return_value=[1, 2], autospec=True)
|
| |
+ def test_command_update_task(self, fakejfu, target, capsys):
|
| |
+ """General tests for the command_update_task function."""
|
| |
+ if target.isdigit():
|
| |
+ targetarg = 'task'
|
| |
+ else:
|
| |
+ targetarg = 'update'
|
| |
+ args = cli.parse_args(
|
| |
+ [targetarg, target, '25']
|
| |
+ )
|
| |
+ with pytest.raises(SystemExit) as excinfo:
|
| |
+ cli.command_update_task(args)
|
| |
+ (out, _) = capsys.readouterr()
|
| |
+ # first arg should be target
|
| |
+ assert fakejfu.call_args[0][0] == target
|
| |
+ # second should be release
|
| |
+ assert fakejfu.call_args[0][1] == 25
|
| |
+ # flavors kwarg should be false-y (not, e.g., [None])
|
| |
+ assert not fakejfu.call_args[1]['flavors']
|
| |
+ # should print out list of scheduled jobs
|
| |
+ assert out == "Scheduled jobs: 1, 2\n"
|
| |
+ # should exit 0
|
| |
+ assert not excinfo.value.code
|
| |
+ # shouldn't force
|
| |
+ assert fakejfu.call_args[1]['force'] is False
|
| |
|
| |
- # check 'force'
|
| |
- args = cli.parse_args(
|
| |
- ['update', target, '25', '--force']
|
| |
- )
|
| |
- with pytest.raises(SystemExit) as excinfo:
|
| |
- cli.command_update_task(args)
|
| |
- # should exit 0
|
| |
- assert not excinfo.value.code
|
| |
- assert fakejfu.call_args[1]['force'] is True
|
| |
+ # check 'flavor'
|
| |
+ args = cli.parse_args(
|
| |
+ ['update', target, '25', '--flavor', 'server']
|
| |
+ )
|
| |
+ with pytest.raises(SystemExit) as excinfo:
|
| |
+ cli.command_update_task(args)
|
| |
+ # should exit 0
|
| |
+ assert not excinfo.value.code
|
| |
+ assert fakejfu.call_args[1]['flavors'] == ['server']
|
| |
|
| |
- # check 'openqa_hostname'
|
| |
- args = cli.parse_args(
|
| |
- ['update', target, '25', '--openqa-hostname', 'openqa.example']
|
| |
- )
|
| |
- with pytest.raises(SystemExit) as excinfo:
|
| |
- cli.command_update_task(args)
|
| |
- # should exit 0
|
| |
- assert not excinfo.value.code
|
| |
- assert fakejfu.call_args[1]['openqa_hostname'] == 'openqa.example'
|
| |
+ # check 'force'
|
| |
+ args = cli.parse_args(
|
| |
+ ['update', target, '25', '--force']
|
| |
+ )
|
| |
+ with pytest.raises(SystemExit) as excinfo:
|
| |
+ cli.command_update_task(args)
|
| |
+ # should exit 0
|
| |
+ assert not excinfo.value.code
|
| |
+ assert fakejfu.call_args[1]['force'] is True
|
| |
|
| |
- # this should not in fact get hit, but just in case we *do* break the code,
|
| |
- # let's mock it to be safe...
|
| |
- @mock.patch('fedora_openqa.schedule.jobs_from_update', return_value=[1, 2], autospec=True)
|
| |
- def test_command_update_nonint(fakejfu):
|
| |
- args = cli.parse_args(
|
| |
- ['task', '123abc', '25']
|
| |
- )
|
| |
- with pytest.raises(SystemExit) as excinfo:
|
| |
- cli.command_update_task(args)
|
| |
- # should exit 1
|
| |
- assert excinfo.value.code == 1
|
| |
+ # check 'openqa_hostname'
|
| |
+ args = cli.parse_args(
|
| |
+ ['update', target, '25', '--openqa-hostname', 'openqa.example']
|
| |
+ )
|
| |
+ with pytest.raises(SystemExit) as excinfo:
|
| |
+ cli.command_update_task(args)
|
| |
+ # should exit 0
|
| |
+ assert not excinfo.value.code
|
| |
+ assert fakejfu.call_args[1]['openqa_hostname'] == 'openqa.example'
|
| |
|
| |
- @pytest.mark.parametrize(
|
| |
- "jobargs,argname,expecteds",
|
| |
- # args, which kwarg we expect report function to get, list of
|
| |
- # the expected values of specified kwarg for each expected
|
| |
- # call to the report function
|
| |
- [
|
| |
- (["1", "2", "3"], "jobs", [[1, 2, 3]]),
|
| |
- (
|
| |
- ["Fedora-Rawhide-20170207.n.0", "Fedora-25-20170207.n.1"],
|
| |
- "build",
|
| |
- ["Fedora-Rawhide-20170207.n.0", "Fedora-25-20170207.n.1"]
|
| |
+ # this should not in fact get hit, but just in case we *do* break the code,
|
| |
+ # let's mock it to be safe...
|
| |
+ @mock.patch('fedora_openqa.schedule.jobs_from_update', return_value=[1, 2], autospec=True)
|
| |
+ def test_command_update_nonint(self, fakejfu):
|
| |
+ """Test we exit 1 on a non-integer 'task' ID."""
|
| |
+ args = cli.parse_args(
|
| |
+ ['task', '123abc', '25']
|
| |
)
|
| |
- ]
|
| |
- )
|
| |
- @pytest.mark.parametrize(
|
| |
- "targargs,repwiki,reprdb",
|
| |
- # args, should report_wiki be called, should report_resultsdb
|
| |
- # be called
|
| |
- [
|
| |
- ([], False, False),
|
| |
- (["--wiki"], True, False),
|
| |
- (["--resultsdb"], False, True),
|
| |
- (["--wiki", "--resultsdb"], True, True)
|
| |
- ]
|
| |
- )
|
| |
- @pytest.mark.parametrize(
|
| |
- "oqaargs,oqah,oqau",
|
| |
- # args, expected openqa_hostname, expected openqa_baseurl
|
| |
- [
|
| |
- ([], None, None),
|
| |
- (["--openqa-hostname", "test.ing"], "test.ing", None),
|
| |
- (["--openqa-baseurl", "https://test.ing"], None, "https://test.ing"),
|
| |
- (["--openqa-hostname", "test.ing", "--openqa-baseurl", "https://test.ing"], "test.ing", "https://test.ing")
|
| |
- ]
|
| |
- )
|
| |
- @pytest.mark.parametrize(
|
| |
- "wikiargs,wikih",
|
| |
- # args, expected wiki_hostname
|
| |
- [
|
| |
- ([], None),
|
| |
- (["--wiki-hostname", "test2.ing"], "test2.ing")
|
| |
- ]
|
| |
- )
|
| |
- @pytest.mark.parametrize(
|
| |
- "rdbargs,rdbu",
|
| |
- # args, expected resultsdb_url
|
| |
- [
|
| |
- ([], None),
|
| |
- (["--resultsdb-url", "test3.ing"], "test3.ing")
|
| |
- ]
|
| |
- )
|
| |
- @mock.patch('fedora_openqa.report.wiki_report', autospec=True)
|
| |
- @mock.patch('fedora_openqa.report.resultsdb_report', autospec=True)
|
| |
- def test_variations(fakerdb, fakewiki, jobargs, argname, expecteds, targargs, repwiki, reprdb,
|
| |
- oqaargs, oqah, oqau, wikiargs, wikih, rdbargs, rdbu):
|
| |
- """Okay, that was a lot of parametrization! But really we're
|
| |
- just testing all possible arg combinations: both types of job
|
| |
- arg (job IDs and build IDs), all four possible report targets
|
| |
- (wiki, resultsdb, both, neither), all combinations of openqa
|
| |
- hostname and baseurl, and both possibilities for wiki hostname
|
| |
- and ResultsDB URL (specified or not). We test all possible
|
| |
- combinations of these with each other by stacking decorators.
|
| |
- """
|
| |
- fakerdb.reset_mock()
|
| |
- fakewiki.reset_mock()
|
| |
- args = cli.parse_args(["report"] + targargs + oqaargs + wikiargs + rdbargs + jobargs)
|
| |
- cli.command_report(args)
|
| |
+ with pytest.raises(SystemExit) as excinfo:
|
| |
+ cli.command_update_task(args)
|
| |
+ # should exit 1
|
| |
+ assert excinfo.value.code == 1
|
| |
+
|
| |
+
|
| |
+ class TestCommandFCOSBuild:
|
| |
+ """Tests for the command_fcosbuild function."""
|
| |
+ @mock.patch('fedora_openqa.schedule.jobs_from_fcosbuild', return_value=[1, 2], autospec=True)
|
| |
+ def test_fcosbuild(self, fakejff, capsys):
|
| |
+ """General tests for command_fcosbuild."""
|
| |
+ args = cli.parse_args(["fcosbuild"])
|
| |
+ with pytest.raises(SystemExit) as excinfo:
|
| |
+ cli.command_fcosbuild(args)
|
| |
+ (out, _) = capsys.readouterr()
|
| |
+ # stream kwarg should be default stream ("next")
|
| |
+ assert fakejff.call_args[1]["stream"] == "next"
|
| |
+ # flavors kwarg should be false-y (not, e.g., [None])
|
| |
+ assert not fakejff.call_args[1]["flavors"]
|
| |
+ # shouldn't force
|
| |
+ assert fakejff.call_args[1]["force"] is False
|
| |
+ # should print out list of scheduled jobs
|
| |
+ assert out == "Scheduled jobs: 1, 2\n"
|
| |
+ # should exit 0
|
| |
+ assert not excinfo.value.code
|
| |
+
|
| |
+ # check explicit stream selection
|
| |
+ args = cli.parse_args(["fcosbuild", "--stream", "testing"])
|
| |
+ with pytest.raises(SystemExit) as excinfo:
|
| |
+ cli.command_fcosbuild(args)
|
| |
+ # should exit 0
|
| |
+ assert not excinfo.value.code
|
| |
+ assert fakejff.call_args[1]["stream"] == "testing"
|
| |
+
|
| |
+ # check 'flavors'
|
| |
+ args = cli.parse_args(["fcosbuild", "--flavors", "foo,bar"])
|
| |
+ with pytest.raises(SystemExit) as excinfo:
|
| |
+ cli.command_fcosbuild(args)
|
| |
+ # should exit 0
|
| |
+ assert not excinfo.value.code
|
| |
+ assert fakejff.call_args[1]["flavors"] == ["foo", "bar"]
|
| |
+
|
| |
+ # check 'force'
|
| |
+ args = cli.parse_args(["fcosbuild", "--force"])
|
| |
+ with pytest.raises(SystemExit) as excinfo:
|
| |
+ cli.command_fcosbuild(args)
|
| |
+ # should exit 0
|
| |
+ assert not excinfo.value.code
|
| |
+ assert fakejff.call_args[1]["force"] is True
|
| |
+
|
| |
+
|
| |
+ class TestCommandReport:
|
| |
+ """Tests for the command_report function."""
|
| |
+ @pytest.mark.parametrize(
|
| |
+ "jobargs,argname,expecteds",
|
| |
+ # args, which kwarg we expect report function to get, list of
|
| |
+ # the expected values of specified kwarg for each expected
|
| |
+ # call to the report function
|
| |
+ [
|
| |
+ (["1", "2", "3"], "jobs", [[1, 2, 3]]),
|
| |
+ (
|
| |
+ ["Fedora-Rawhide-20170207.n.0", "Fedora-25-20170207.n.1"],
|
| |
+ "build",
|
| |
+ ["Fedora-Rawhide-20170207.n.0", "Fedora-25-20170207.n.1"]
|
| |
+ )
|
| |
+ ]
|
| |
+ )
|
| |
+ @pytest.mark.parametrize(
|
| |
+ "targargs,repwiki,reprdb",
|
| |
+ # args, should report_wiki be called, should report_resultsdb
|
| |
+ # be called
|
| |
+ [
|
| |
+ ([], False, False),
|
| |
+ (["--wiki"], True, False),
|
| |
+ (["--resultsdb"], False, True),
|
| |
+ (["--wiki", "--resultsdb"], True, True)
|
| |
+ ]
|
| |
+ )
|
| |
+ @pytest.mark.parametrize(
|
| |
+ "oqaargs,oqah,oqau",
|
| |
+ # args, expected openqa_hostname, expected openqa_baseurl
|
| |
+ [
|
| |
+ ([], None, None),
|
| |
+ (["--openqa-hostname", "test.ing"], "test.ing", None),
|
| |
+ (["--openqa-baseurl", "https://test.ing"], None, "https://test.ing"),
|
| |
+ (["--openqa-hostname", "test.ing", "--openqa-baseurl", "https://test.ing"],
|
| |
+ "test.ing", "https://test.ing")
|
| |
+ ]
|
| |
+ )
|
| |
+ @pytest.mark.parametrize(
|
| |
+ "wikiargs,wikih",
|
| |
+ # args, expected wiki_hostname
|
| |
+ [
|
| |
+ ([], None),
|
| |
+ (["--wiki-hostname", "test2.ing"], "test2.ing")
|
| |
+ ]
|
| |
+ )
|
| |
+ @pytest.mark.parametrize(
|
| |
+ "rdbargs,rdbu",
|
| |
+ # args, expected resultsdb_url
|
| |
+ [
|
| |
+ ([], None),
|
| |
+ (["--resultsdb-url", "test3.ing"], "test3.ing")
|
| |
+ ]
|
| |
+ )
|
| |
+ @mock.patch('fedora_openqa.report.wiki_report', autospec=True)
|
| |
+ @mock.patch('fedora_openqa.report.resultsdb_report', autospec=True)
|
| |
+ def test_variations(self, fakerdb, fakewiki, jobargs, argname, expecteds, targargs, repwiki, reprdb,
|
| |
+ oqaargs, oqah, oqau, wikiargs, wikih, rdbargs, rdbu):
|
| |
+ """Okay, that was a lot of parametrization! But really we're
|
| |
+ just testing all possible arg combinations: both types of job
|
| |
+ arg (job IDs and build IDs), all four possible report targets
|
| |
+ (wiki, resultsdb, both, neither), all combinations of openqa
|
| |
+ hostname and baseurl, and both possibilities for wiki hostname
|
| |
+ and ResultsDB URL (specified or not). We test all possible
|
| |
+ combinations of these with each other by stacking decorators.
|
| |
+ """
|
| |
+ fakerdb.reset_mock()
|
| |
+ fakewiki.reset_mock()
|
| |
+ args = cli.parse_args(["report"] + targargs + oqaargs + wikiargs + rdbargs + jobargs)
|
| |
+ cli.command_report(args)
|
| |
|
| |
- # find the appropriate mock(s) and check they were called the
|
| |
- # expected number of times
|
| |
- fakes = []
|
| |
- if repwiki:
|
| |
- assert fakewiki.call_count == len(expecteds)
|
| |
- fakes.append(fakewiki)
|
| |
- if reprdb:
|
| |
- assert fakerdb.call_count == len(expecteds)
|
| |
- fakes.append(fakerdb)
|
| |
+ # find the appropriate mock(s) and check they were called the
|
| |
+ # expected number of times
|
| |
+ fakes = []
|
| |
+ if repwiki:
|
| |
+ assert fakewiki.call_count == len(expecteds)
|
| |
+ fakes.append(fakewiki)
|
| |
+ if reprdb:
|
| |
+ assert fakerdb.call_count == len(expecteds)
|
| |
+ fakes.append(fakerdb)
|
| |
|
| |
- # check job arg parsed appropriately. for jobs, we expect one
|
| |
- # call with a list of the job IDs as the jobs arg. For builds,
|
| |
- # we expect as many calls as we included build IDs, with each
|
| |
- # call specifying one build ID as the build arg.
|
| |
- for fake in fakes:
|
| |
- for (idx, expected) in enumerate(expecteds):
|
| |
- assert fake.call_args_list[idx][1][argname] == expected
|
| |
+ # check job arg parsed appropriately. for jobs, we expect one
|
| |
+ # call with a list of the job IDs as the jobs arg. For builds,
|
| |
+ # we expect as many calls as we included build IDs, with each
|
| |
+ # call specifying one build ID as the build arg.
|
| |
+ for fake in fakes:
|
| |
+ for (idx, expected) in enumerate(expecteds):
|
| |
+ assert fake.call_args_list[idx][1][argname] == expected
|
| |
|
| |
- # check the openQA, wiki and rdb args
|
| |
- for fake in fakes:
|
| |
- assert fake.call_args[1]['openqa_hostname'] == oqah
|
| |
- assert fake.call_args[1]['openqa_baseurl'] == oqau
|
| |
- if fakewiki in fakes:
|
| |
- assert fakewiki.call_args[1]['wiki_hostname'] == wikih
|
| |
- if fakerdb in fakes:
|
| |
- assert fake.call_args[1]['resultsdb_url'] == rdbu
|
| |
+ # check the openQA, wiki and rdb args
|
| |
+ for fake in fakes:
|
| |
+ assert fake.call_args[1]['openqa_hostname'] == oqah
|
| |
+ assert fake.call_args[1]['openqa_baseurl'] == oqau
|
| |
+ if fakewiki in fakes:
|
| |
+ assert fakewiki.call_args[1]['wiki_hostname'] == wikih
|
| |
+ if fakerdb in fakes:
|
| |
+ assert fake.call_args[1]['resultsdb_url'] == rdbu
|
| |
|
| |
# vim: set textwidth=120 ts=8 et sw=4:
|
| |
adamwill
commented 4 years ago
This adds the ability to schedule jobs and report results to
ResultsDB for Fedora CoreOS builds. These are not Pungi composes
and so don't have productmd-style metadata or messages, so we
handle them entirely separately. Currently you can only schedule
jobs for the current build from one of the streams, and only for
x86_64 and the "live" ISO. This requires a new version of
resultsdb_conventions that adds conventions for Fedora CoreOS
build results.
Also refactors test_cli a bit as it was confusing that some tests
were in classes and others weren't. Think I did this to make
pylint happy but I'd rather make humans happy than a script,
really...
Signed-off-by: Adam Williamson awilliam@redhat.com