Fix tests

... to match extended id validation

Author: Olivier Gambier

tests/base.py

@@ -35,6 +35,10 @@ def gen_random_string(self, length=16):
         return ''.join([random.choice(string.ascii_uppercase + string.digits)
                         for x in range(length)]).lower()
 
+    def gen_hex_string(self, length=16):
+        return ''.join([random.choice(string.hexdigits)
+                        for x in range(length)]).lower()
+
     def set_image_checksum(self, image_id, checksum):
         headers = {'X-Docker-Checksum-Payload': checksum}
         url = '/v1/images/{0}/checksum'.format(image_id)

tests/test_images.py

@@ -14,14 +14,14 @@
 class TestImages(base.TestCase):
 
     def test_unset_nginx_accel_redirect_layer(self):
-        image_id = self.gen_random_string()
+        image_id = self.gen_hex_string()
         layer_data = self.gen_random_string(1024)
         self.upload_image(image_id, parent_id=None, layer=layer_data)
         resp = self.http_client.get('/v1/images/{0}/layer'.format(image_id))
         self.assertEqual(layer_data, resp.data)
 
     def test_nginx_accel_redirect_layer(self):
-        image_id = self.gen_random_string()
+        image_id = self.gen_hex_string()
         layer_data = self.gen_random_string(1024)
         self.upload_image(image_id, parent_id=None, layer=layer_data)
 
@@ -48,8 +48,8 @@ def test_nginx_accel_redirect_layer(self):
             images.cfg._config.pop('nginx_x_accel_redirect')
 
     def test_simple(self):
-        image_id = self.gen_random_string()
-        parent_id = self.gen_random_string()
+        image_id = self.gen_hex_string()
+        parent_id = self.gen_hex_string()
         layer_data = self.gen_random_string(1024)
         self.upload_image(parent_id, parent_id=None, layer=layer_data)
         self.upload_image(image_id, parent_id=parent_id, layer=layer_data)
@@ -67,7 +67,7 @@ def test_notfound(self):
         self.assertEqual(resp.status_code, 404, resp.data)
 
     def test_bytes_range(self):
-        image_id = self.gen_random_string()
+        image_id = self.gen_hex_string()
         layer_data = self.gen_random_string(1024)
         b = random.randint(0, len(layer_data) / 2)
         bytes_range = (b, random.randint(b + 1, len(layer_data) - 1))
@@ -88,7 +88,7 @@ def before_put_image_json_handler_not_ok(self, sender, image_json):
         return "Not ok"
 
     def test_before_put_image_json_ok(self):
-        image_id = self.gen_random_string()
+        image_id = self.gen_hex_string()
         json_obj = {
             'id': image_id
         }
@@ -100,7 +100,7 @@ def test_before_put_image_json_ok(self):
             self.assertEqual(resp.status_code, 200, resp.data)
 
     def test_before_put_image_json_not_ok(self):
-        image_id = self.gen_random_string()
+        image_id = self.gen_hex_string()
         json_obj = {
             'id': image_id
         }

tests/test_mirrors.py

@@ -17,15 +17,16 @@ def mock_lookup_source(path, stream=False, source=None):
     resp.status_code = 200
     resp._content_consumed = True
     # resp.headers['X-Fake-Source-Header'] = 'foobar'
-    if path.endswith('0145/layer'):
+    if path.endswith('01451234/layer'):
         resp._content = "abcdef0123456789xxxxxx=-//"
-    elif path.endswith('0145/json'):
-        resp._content = ('{"id": "cafebabe0145","created":"2014-02-03T16:47:06'
-                         '.615279788Z"}')
-    elif path.endswith('0145/ancestry'):
-        resp._content = '["cafebabe0145"]'
+    elif path.endswith('01451234/json'):
+        resp._content = ('{"id": "cafebabe01451234",'
+                         '"created":"2014-02-03T16:47:06.615279788Z"}')
+    elif path.endswith('01451234/ancestry'):
+        resp._content = '["cafebabe01451234"]'
     elif path.endswith('test/tags'):
-        resp._content = '{"latest": "cafebabe0145", "0.1.2": "cafebabe0145"}'
+        resp._content = ('{"latest": "cafebabe01451234", "0.1.2": '
+                         '"cafebabe01451234"}')
     else:
         resp.status_code = 404
 
@@ -52,24 +53,24 @@ def test_is_mirror(self):
     @mock.patch('docker_registry.lib.mirroring.lookup_source',
                 mock_lookup_source)
     def test_source_lookup(self):
-        resp = self.http_client.get('/v1/images/cafebabe0145/layer')
+        resp = self.http_client.get('/v1/images/cafebabe01451234/layer')
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(resp.data, "abcdef0123456789xxxxxx=-//")
 
-        resp_2 = self.http_client.get('/v1/images/cafebabe0145/json')
+        resp_2 = self.http_client.get('/v1/images/cafebabe01451234/json')
         self.assertEqual(resp_2.status_code, 200)
         # Note(dmp): unicode patch XXX not applied assume requests does the job
         json_data = json.loads(resp_2.data)
         assert 'id' in json_data
         assert 'created' in json_data
-        self.assertEqual(json_data['id'], 'cafebabe0145')
+        self.assertEqual(json_data['id'], 'cafebabe01451234')
 
-        resp_3 = self.http_client.get('/v1/images/cafebabe0145/ancestry')
+        resp_3 = self.http_client.get('/v1/images/cafebabe01451234/ancestry')
         self.assertEqual(resp_3.status_code, 200)
         # Note(dmp): unicode patch XXX not applied assume requests does the job
         json_data_2 = json.loads(resp_3.data)
         self.assertEqual(len(json_data_2), 1)
-        self.assertEqual(json_data_2[0], 'cafebabe0145')
+        self.assertEqual(json_data_2[0], 'cafebabe01451234')
 
         resp_4 = self.http_client.get('/v1/images/doe587e8157/json')
         self.assertEqual(resp_4.status_code, 404)
@@ -81,7 +82,7 @@ def test_source_lookup_tag(self):
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(
             resp.data,
-            '{"latest": "cafebabe0145", "0.1.2": "cafebabe0145"}'
+            '{"latest": "cafebabe01451234", "0.1.2": "cafebabe01451234"}'
         )
 
         resp_2 = self.http_client.get('/v1/repositories/testing/bogus/tags')

tests/test_tags.py

@@ -11,7 +11,7 @@ class TestTags(base.TestCase):
     def test_simple(self, repos_name=None):
         if repos_name is None:
             repos_name = self.gen_random_string()
-        image_id = self.gen_random_string()
+        image_id = self.gen_hex_string()
         layer_data = self.gen_random_string(1024)
         self.upload_image(image_id, parent_id=None, layer=layer_data)
 

tests/workflow.py

@@ -100,8 +100,8 @@ def update_tag(self, namespace, repos, image_id, tag_name):
 
     def docker_push(self):
         # Test Push
-        self.image_id = self.gen_random_string()
-        self.parent_id = self.gen_random_string()
+        self.image_id = self.gen_hex_string()
+        self.parent_id = self.gen_hex_string()
         image_id = self.image_id
         parent_id = self.parent_id
         namespace = self.user_credentials[0]