Merge lp:~brendan-donegan/qakit/upload_improvements_fixes into lp:qakit

[Brendan Donegan]

Refactor code a little and allow test level and build info to be passed to the script, as well as allowing devices to be specified to the manual option

Needed to allow the test level and build info (output from system-image-cli -i) to be specified, and at the same time did a bit of refactoring. Also split the 'Sanity' test filter out into individual devices so that the test sets contain only the appropriate tests.

[Allan LeSage (allanlesage)]

No objection to this. At some future date when this is deployed somewhere we'd probably prefer to use a logger (e.g. util.logger) vs. print but this is fine for now.

review: Approve

[Brendan Donegan (brendan-donegan)]

print() is fine here as it's program output, not logging - the time stamps and severity text that would automatically be added would just make it ugly

[Sergio Cazzolato (sergio-j-cazzolato)]

brendand, the code seems to be ok, how can I test it?

[Brendan Donegan (brendan-donegan)]

Sergio - don't worry it's already landed. I only moved it to review as it had not been put in production yet, but should be now

=== modified file 'qakit/practitest/practitest.py'
--- qakit/practitest/practitest.py	2015-08-19 18:16:08 +0000
+++ qakit/practitest/practitest.py	2015-09-03 13:34:12 +0000
@@ -42,6 +42,7 @@
                      'level': 10490,
                     'release': 10433,
                     'build': 10578,
+                    'buildinfo': 10872,
                     'external_id': 10589,
                     'tester': 30429
         }
@@ -160,7 +161,8 @@
         url = PROD_PRACTITEST + '/sets/{}.json'.format(id)
         return self._get(url).json()
 
-    def create_testset(self, name, priority, device, level, release, build):
+    def create_testset(self, name, priority, device, 
+                       level, release, build, buildinfo):
         """
         Create a test set with the name and priority provided.
 
@@ -172,7 +174,8 @@
                   self.pt_field('device'): {'value': device},
                   self.pt_field('level'): {'value': level},
                   self.pt_field('release'): {'value': release},
-                  self.pt_field('build'): {'value': build}}
+                  self.pt_field('build'): {'value': build},
+                  self.pt_field('buildinfo'): {'value': buildinfo}}
         return self._post(url, data=params).json()
 
     def get_instances(self, id):

=== modified file 'qakit/practitest/report_subunit_results_to_practitest.py'
--- qakit/practitest/report_subunit_results_to_practitest.py	2015-06-24 20:30:44 +0000
+++ qakit/practitest/report_subunit_results_to_practitest.py	2015-09-03 13:34:12 +0000
@@ -23,7 +23,9 @@
 from qakit.practitest import practisubunit
 from qakit.practitest import subunit_results
 
-DOMAIN_FILTER_IDS = {'Sanity': '55736',
+DOMAIN_FILTER_IDS = {'Sanity/Arale': '55737',
+                     'Sanity/Krillin': '55738',
+                     'Sanity/Mako': '55739',
                      'Web': '55419'}
 
 
@@ -32,20 +34,51 @@
     parser = argparse.ArgumentParser(
         'Report subunit suite results to Practitest.')
     parser.add_argument('filepath', help='subunit result filepath')
-    parser.add_argument('--testset-number', '-t',
-                        type=int,
-                        help='PractiTest TestSet #')
-    parser.add_argument('--testset-name', '-n',
-                        help='The name of the test set to create')
-    parser.add_argument('--manual', '-m',
-                        help='Add the manual tests for the specified domain '
-                             'to the test set as well.')
-    parser.add_argument('--device', '-d',
-                        help='The name of the device the tests were run on')
-    parser.add_argument('--release', '-r',
-                        help='The release of Ubuntu the tests were run on')
-    parser.add_argument('--build', '-b',
-                        help='The build ID of the image the tests were run on')
+    subparsers = parser.add_subparsers()
+    update_parser = subparsers.add_parser(
+        'update',
+        help='Update an existing test set with results'
+    )
+    update_parser.add_argument(
+        'number',
+        type=int,
+        help='PractiTest TestSet #'
+    )
+    update_parser.set_defaults(func=_update_testset)
+    create_parser = subparsers.add_parser(
+        'create',
+        help='Create a new testset with the results'
+    )
+    create_parser.add_argument(
+        'name',
+        help='The name of the test set to create'
+    )
+    create_parser.add_argument(
+        'device',
+        help='The name of the device the tests were run on'
+    )
+    create_parser.add_argument(
+        'level',
+        help='The test level to be set in PractiTest.'
+    )
+    create_parser.add_argument(
+        'release',
+        help='The release of Ubuntu the tests were run on'
+    )
+    create_parser.add_argument(
+        'build',
+        help='The build ID of the image the tests were run on'
+    )
+    create_parser.add_argument(
+        'buildinfo',
+        help='The output of system-image-cli -i',
+    )
+    create_parser.add_argument(
+        '--manual', '-m',
+        help='Add the manual tests for the specified domain '
+             'to the test set as well.'
+    )
+    create_parser.set_defaults(func=_create_testset)
     return parser.parse_args()
 
 
@@ -94,11 +127,35 @@
     return config
 
 
-def _create_testset(testset_name, device, release, build, session):
-    return session.create_testset(testset_name, 'medium',
-                                  device, 'Regression',
-                                  release, build)
-
+def _create_testset(args, practisubunit_session, results):
+    import pdb; pdb.set_trace()
+    testset = practisubunit_session.create_testset(
+        args.name, 'medium',
+        args.device, args.level,
+        args.release, args.build,
+        args.buildinfo
+    )
+    _create_instances(results, testset, practisubunit_session,
+                      args.manual)
+    return testset
+
+def _update_testset(args, practisubunit_session):
+    _confirm_name_of_testset(args.testset_number, practisubunit_session)
+    testset = practisubunit_session.get_testset(args.testset_number)
+    return testset
+
+def _report_to_practitest(project_id, testset, practisubunit_session, results):
+    practisubunit_results = practisubunit.PractiSubunitResultSet(
+        practisubunit_session,
+        testset['id'],
+        results)
+    practisubunit_results.report_to_practitest()
+    print(
+        "Reported results to "
+        "https://prod.practitest.com/p/{}/sets/{}/edit".format(
+            project_id, testset['system_id']
+        )
+    )
 
 def _create_instances(results, testset, session, manual=None):
     # First get all the automated tests in PractiTest
@@ -130,33 +187,8 @@
                      'config.ini'))
     practisubunit_session = practisubunit.PractiSubunitSession(**config)
     results = subunit_results.parse(args.filepath)
-    testset_number = args.testset_number
-    if args.testset_number:
-        _confirm_name_of_testset(testset_number, practisubunit_session)
-        testset_system_id = practisubunit_session.get_testset(
-            args.testset_number)['system_id']
-    else:
-        testset = _create_testset(args.testset_name, args.device,
-                                  args.release, args.build,
-                                  practisubunit_session)
-        if testset:
-            testset_number = testset['id']
-            testset_system_id = testset['system_id']
-            _create_instances(results, testset, practisubunit_session,
-                              args.manual)
-
-    practisubunit_results = practisubunit.PractiSubunitResultSet(
-        practisubunit_session,
-        testset_number,
-        results)
-    practisubunit_results.report_to_practitest()
-    print(
-        "Reported results to "
-        "https://prod.practitest.com/p/{}/sets/{}/edit".format(
-            config['project_id'], testset_system_id
-        )
-    )
-
+    testset = args.func(args, practisubunit_session, results)
+    _report_to_practitest(config['project_id'], testset, practisubunit_session, results)
 
 if __name__ == '__main__':
     sys.exit(main())