Fixed Unity Asset Uploader unit test.

This changes unity_asset_uploader to no longer throw an exception if
the response doesn't have a status field.  The test has been fixed to
correctly build the login response and all metadata responses.
In addition, this moves all assertions in the test to use the unittest
module so that failures are reported with useful error messages rather
than simply "assetion failed".

Change-Id: I6abb180330bb815568a7a43d4b3f7184317ab70a

Author: Stewart Miles

source/UnityAssetUploader/unity_asset_uploader.py

@@ -446,11 +446,12 @@ def upload_package(
         unity_version=unity_version,
         tools_version=tools_version)
     response_ob = session.upload_package(package_id, package_path)
-    print("status={}".format(response_ob['status']))
-    if response_ob['status'] != 'ok':
+    status = response_ob.get('status', '<unknown>')
+    print("status={}".format(status))
+    if status != 'ok':
         raise RequestError(
             'Non-success response from Asset Store request: {}'.format(
-                response_ob['status']))
+                status))
     print(response_ob)
 
 

source/UnityAssetUploader/unity_asset_uploader_test.py

@@ -50,13 +50,14 @@ def setUp(self):
                 "/login?{}".format(self.parsed_params),
                 headers={'Accept': 'application/json'}),
             call('GET',
-                 "/api/asset-store-tools/metadata/0.json?{}" +
-                 "&xunitysession=this_session_id".format(
+                 ("/api/asset-store-tools/metadata/0.json?{}" +
+                  "&xunitysession=this_session_id").format(
                      self.parsed_params),
                  headers={'Accept': 'application/json'}),
         ]
 
         self.expected_metadata = {
+            'status': 'ok',
             'xunitysession': 'this_session_id',
             'publisher': {
                 'id': 'publisher_id',
@@ -107,7 +108,7 @@ def test_display_session_id(self, mock_stdout, mock_connection, mock_json):
 
         mock_json.load.assert_called_with(
             mock_connection.return_value.getresponse.return_value)
-        assert 'this_session_id' in mock_stdout.getvalue()
+        self.assertIn('this_session_id', mock_stdout.getvalue())
 
     @patch('unity_asset_uploader.json')
     @patch('unity_asset_uploader.client.HTTPSConnection')
@@ -124,11 +125,12 @@ def test_get_metadata(self, mock_stdout, mock_connection, mock_json):
         metadata = session.get_metadata()
 
         request = mock_connection.return_value.request
-        assert request.call_args_list == self.expected_login_and_metadata_calls
+        self.assertEqual(self.expected_login_and_metadata_calls,
+                         request.call_args_list)
 
         mock_json.load.assert_called_with(
             mock_connection.return_value.getresponse.return_value)
-        assert metadata == self.expected_metadata
+        self.assertEqual(self.expected_metadata, metadata)
 
     @patch('unity_asset_uploader.json')
     @patch('unity_asset_uploader.client.HTTPSConnection')
@@ -145,16 +147,17 @@ def test_display_publisher_info(
             None)
 
         request = mock_connection.return_value.request
-        assert request.call_args_list == self.expected_login_and_metadata_calls
+        self.assertEqual(self.expected_login_and_metadata_calls,
+                         request.call_args_list)
 
         mock_json.load.assert_called_with(
             mock_connection.return_value.getresponse.return_value)
 
         out = mock_stdout.getvalue()
-        assert 'publisher_id' in out
-        assert 'publisher_name' in out
-        assert '123' in out
-        assert '456' in out
+        self.assertIn('publisher_id', out)
+        self.assertIn('publisher_name', out)
+        self.assertIn('123', out)
+        self.assertIn('456', out)
 
     @patch('unity_asset_uploader.json')
     @patch('unity_asset_uploader.client.HTTPSConnection')
@@ -170,7 +173,8 @@ def test_display_listings(self, mock_stdout, mock_connection, mock_json):
             None)
 
         request = mock_connection.return_value.request
-        assert request.call_args_list == self.expected_login_and_metadata_calls
+        self.assertEqual(self.expected_login_and_metadata_calls,
+                         request.call_args_list)
 
         mock_json.load.assert_called_with(
             mock_connection.return_value.getresponse.return_value)
@@ -179,7 +183,7 @@ def test_display_listings(self, mock_stdout, mock_connection, mock_json):
         expected_456 = self.expected_metadata['packages']['456']
         package_two_values = expected_456.keys
         for key in unity_asset_uploader.LISTING_TRAITS:
-            assert "{}={}".format(key, expected_456[key]) in out
+            self.assertIn("{}={}".format(key, expected_456[key]), out)
 
     @patch('unity_asset_uploader.open')
     @patch('unity_asset_uploader.json')
@@ -221,7 +225,7 @@ def test_upload_package_draft(
             headers={'Accept': 'application/json'}))
 
         request = mock_connection.return_value.request
-        assert request.call_args_list == expected_call_args
+        self.assertEqual(expected_call_args, request.call_args_list)
 
         mock_json.load.assert_called_with(
             mock_connection.return_value.getresponse.return_value)
@@ -249,10 +253,11 @@ def test_upload_package_published_error(
                 '456',
                 '/mock_project2/mock_path.unityasset')
 
-            assert 'no draft created for package 456' in cm.exception.output
+            self.assertIn('no draft created for package 456', cm.exception.output)
 
         request = mock_connection.return_value.request
-        assert request.call_args_list == self.expected_login_and_metadata_calls
+        self.assertEqual(self.expected_login_and_metadata_calls,
+                         request.call_args_list)
 
         mock_json.load.assert_called_with(
             mock_connection.return_value.getresponse.return_value)
@@ -279,10 +284,11 @@ def test_upload_package_not_found_error(
                 '789',
                 '/mock_project3/mock_path.unityasset')
             error_msg = 'could not find package with version ID 789'
-            assert error_msg in cm.exception.output
+            self.assertIn(error_msg, cm.exception.output)
 
         request = mock_connection.return_value.request
-        assert request.call_args_list == self.expected_login_and_metadata_calls
+        self.assertEqual(self.expected_login_and_metadata_calls,
+                         request.call_args_list)
 
         mock_json.load.assert_called_with(
             mock_connection.return_value.getresponse.return_value)