Differential D1062

Fix test dist-git namespaces.
ClosedPublic
Actions

Authored by • ralph2 on Dec 2 2016, 9:34 PM.

Details

Reviewers
tflink
jskladan
Commits
rTRGR026e2b65ccb2: Fix test dist-git namespaces.
Summary

This just updates the example config to use the new namespaces.

Test Plan

None necessary.

Diff Detail

Repository
rTRGR taskotron-trigger
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
• ralph2 retitled this revision from to Fix test dist-git namespaces..Dec 2 2016, 9:34 PM
• ralph2 updated this object.
• ralph2 edited the test plan for this revision. (Show Details)
• ralph2 added a reviewer: tflink.
jskladan accepted this revision.Dec 3 2016, 5:02 PM
jskladan added a reviewer: jskladan.
This revision is now accepted and ready to land.Dec 3 2016, 5:02 PM
tflink accepted this revision.Dec 5 2016, 2:49 PM
Closed by commit rTRGR026e2b65ccb2: Fix test dist-git namespaces. (authored by Ralph Bean <rbean@redhat.com>). · Explain WhyDec 7 2016, 5:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mconf/trigger_rules.yml.example (4 lines)
Mtesting/test_utils.py (2 lines)

Diff 2709

View Options

conf/trigger_rules.yml.example

1--- 1​---
2- when: {message_type: KojiBuildPackageCompleted} 2​- when: {message_type: KojiBuildPackageCompleted}
3 do: 3​ do:
4 - {tasks: [rpmlint, rpmgrill]} 4​ - {tasks: [rpmlint, rpmgrill]}
5 - {discover: {repo: 'http://pkgs.fedoraproject.org/git/rpms-checks/${name}.git', branch: "${distgit_branch}"}} 5​ - {discover: {repo: 'http://pkgs.fedoraproject.org/git/test-rpms/${name}.git', branch: "${distgit_branch}"}}
6- when: {message_type: KojiBuildDockerCompleted} 6​- when: {message_type: KojiBuildDockerCompleted}
7 do: 7​ do:
8 - {discover: {repo: 'http://pkgs.fedoraproject.org/git/docker-checks/${name}.git', branch: "${distgit_branch}"}} 8​ - {discover: {repo: 'http://pkgs.fedoraproject.org/git/test-docker/${name}.git', branch: "${distgit_branch}"}}
9- when: {message_type: KojiBuildPackageCompleted, name: docker} 9​- when: {message_type: KojiBuildPackageCompleted, name: docker}
10 do: 10​ do:
11 - {tasks: [dockerautotest]} 11​ - {tasks: [dockerautotest]}
12- when: 12​- when:
13 message_type: KojiBuildPackageCompleted 13​ message_type: KojiBuildPackageCompleted
14 name: 14​ name:
15 $in: ${critpath_pkgs} 15​ $in: ${critpath_pkgs}
16 $nin: [] 16​ $nin: []
Show All 10 Lines
View Options

testing/test_utils.py

Show First 20 Lines • Show All 85 Lines • ▼ Show 20 Line(s)85 def test_distgit_tasks(self, monkeypatch):
86 mock_check_output = mock.Mock(return_value='') 86​ mock_check_output = mock.Mock(return_value='')
87 mock__should_schedule = mock.Mock(return_value=True) 87​ mock__should_schedule = mock.Mock(return_value=True)
88 monkeypatch.setattr(subprocess, 'check_output', mock_check_output) 88​ monkeypatch.setattr(subprocess, 'check_output', mock_check_output)
89 monkeypatch.setattr(utils, '_should_schedule', mock__should_schedule) 89​ monkeypatch.setattr(utils, '_should_schedule', mock__should_schedule)
90 monkeypatch.setattr(os, 'listdir', lambda x: ['rpmlint']) 90​ monkeypatch.setattr(os, 'listdir', lambda x: ['rpmlint'])
91 monkeypatch.setattr(os.path, 'isdir', lambda x: True) 91​ monkeypatch.setattr(os.path, 'isdir', lambda x: True)
92 monkeypatch.setattr(config, 'git_cache_dir', '/path/to') 92​ monkeypatch.setattr(config, 'git_cache_dir', '/path/to')
93 93​
94 repo = 'http://pkgs.fedoraproject.org/git/rpms-checks/firefox.git' 94​ repo = 'http://pkgs.fedoraproject.org/git/test-rpms/firefox.git'
95 tasks = utils.discover_tasks('koji_build', repo) 95​ tasks = utils.discover_tasks('koji_build', repo)
96 import pprint 96​ import pprint
97 pprint.pprint(mock_check_output.call_args) 97​ pprint.pprint(mock_check_output.call_args)
98 pprint.pprint(mock__should_schedule.call_args) 98​ pprint.pprint(mock__should_schedule.call_args)
99 assert mock_check_output.call_args[0][0][6] == repo 99​ assert mock_check_output.call_args[0][0][6] == repo
100 assert mock_check_output.call_args[0][0][ 100​ assert mock_check_output.call_args[0][0][
101 7] == os.path.join('/path/to', 'firefox') 101​ 7] == os.path.join('/path/to', 'firefox')
102 assert mock__should_schedule.call_args[0][0] == os.path.join('/path/to', 102​ assert mock__should_schedule.call_args[0][0] == os.path.join('/path/to',
Show All 18 Lines