Check in diffs for the test db. Try to make the test db identifiers predictable.

config.py

@@ -24,7 +24,7 @@ class MailConfig(object):
 
 
 class SQLiteDB(object):
-  DB_NAME = 'test.db'
+  DB_NAME = 'test/data/test.db'
   DB_CONNECTION_ARGS = {
     'threadlocals': True
   }
@@ -51,7 +51,7 @@ class S3Storage(object):
 
 class LocalStorage(object):
   STORAGE_KIND = 'local'
-  LOCAL_STORAGE_DIR = '/tmp/registry'
+  LOCAL_STORAGE_DIR = 'test/data/registry'
 
 
 class StripeTestConfig(object):

initdb.py

@@ -1,26 +1,42 @@
 import logging
 import string
+import shutil
+import os
+import hashlib
 
-from random import SystemRandom
 from datetime import datetime
 
+import storage
+
 from data.database import initialize_db
 from data import model
 from app import app
 
 
 logger = logging.getLogger(__name__)
+store = storage.load()
 logging.basicConfig(**app.config['LOGGING_CONFIG'])
 
 
-def __gen_hex_id(length=64):
+SAMPLE_DIFFS = [
-  random = SystemRandom()
+  'test/data/sample/diffs/diffs.json',
-  return ''.join([random.choice('abcdef' + string.digits)
+  'test/data/sample/diffs/diffs2.json',
-                  for x in range(length)])
+  'test/data/sample/diffs/diffs3.json',
+]
 
 
-def __gen_checksum():
+def __gen_checksum(image_id):
-  return 'tarsum+sha256:' + __gen_hex_id(64)
+  h = hashlib.md5(image_id)
+  return 'tarsum+sha256:' + h.hexdigest()
+
+
+global_image_num = [0]
+def __gen_image_id(repo):
+  str_to_hash = "%s/%s/%s" % (repo.namespace, repo.name, global_image_num[0])
+  global_image_num[0] += 1
+
+  h = hashlib.md5(str_to_hash)
+  return h.hexdigest()
 
 
 def create_subtree(repo, structure, parent):
@@ -28,8 +44,9 @@ def create_subtree(repo, structure, parent):
 
   # create the nodes
   for i in range(num_nodes):
-    docker_image_id = __gen_hex_id()
+    docker_image_id = __gen_image_id(repo)
-    checksum = __gen_checksum()
+    logger.debug('new docker id: %s' % docker_image_id)
+    checksum = __gen_checksum(docker_image_id)
 
     new_image = model.create_image(docker_image_id, repo)
     model.set_image_checksum(docker_image_id, repo, checksum)
@@ -38,6 +55,14 @@ def create_subtree(repo, structure, parent):
                                          repo.name, str(datetime.now()),
                                          'no comment', parent)
 
+    # Populate the diff file
+    diff_path = store.image_file_diffs_path(repo.namespace, repo.name,
+                                          docker_image_id)
+    source_diff = SAMPLE_DIFFS[i % len(SAMPLE_DIFFS)]
+
+    with open(source_diff, 'r') as source_file:
+      store.stream_write(diff_path, source_file)
+
     parent = new_image
 
   if last_node_tags:

test/data/registry/images/devtable/complex/d3acf10ce5ad8b208ba38e626ced2946/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/devtable/gargantuan/0ccb6d859cbdf08f5c71132707e144fc/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/devtable/gargantuan/1dcf485dfbdf2ee735d39f74d4ec9132/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/devtable/gargantuan/1f9c4e12e13735668f2f2b5ebed92a27/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/devtable/gargantuan/22d54e9c626a2aa258e5185dc315d5a0/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/devtable/gargantuan/2561f1d3a276103635c2cde5a7dc7759/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/devtable/gargantuan/8324a62cde97d7a0ebfc011068186a05/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/devtable/gargantuan/8de22bdae0bcfee17a4b54c46ccca70a/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/devtable/gargantuan/c1d29009854393d48c3c9a64891e2ba6/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/devtable/shared/fb820a41a1b0f94cf779305c2e23d4d1/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/devtable/simple/44c28f16388dcfba12cbde037563982c/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/public/publicrepo/030581d6f421978b637479b73f862b63/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/public/publicrepo/1b4bc84b74c71ac837ff19eae76e76c0/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/registry/images/public/publicrepo/7025cb49ee8cd5da3054e4b69210fdbe/diffs.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}

test/data/sample/diffs/diffs3.json

@@ -0,0 +1,16 @@
+{
+  "removed": [], 
+  "added": [
+    "dev/kmsg", 
+    "root/.bash_history", 
+    "usr/sbin/policy-rc.d"
+  ], 
+  "changed": [
+    "tmp", 
+    "dev", 
+    ".", 
+    "usr", 
+    "root", 
+    "usr/sbin"
+  ]
+}