fix deletion

ccfilestore.py

@@ -58,9 +58,13 @@ def writer(self, user):
 
     def delete_user(self, user):
         user_fn = self._get_userlist_path(user)
-        for key in open(user_fn):
-            key = key.strip()
-            if not key:
-                continue
-            os.remove(self._get_keypath(key))
-        os.remove(user_fn)
+        try:
+            for key in open(user_fn):
+                key = key.strip()
+                if not key:
+                    continue
+                os.remove(self._get_keypath(key))
+        except IOError:
+            pass
+        else:
+            os.remove(user_fn)

cchttpserver.py

@@ -1,4 +1,4 @@
-__version__ = "0.6.0.dev1"
+__version__ = "0.6.0"
 
 from flask import Flask, request
 from flask_httpauth import HTTPBasicAuth
@@ -11,14 +11,15 @@ def create_app(test_config=None):
 
     if test_config is None:
         # load the instance config, if it exists, when not testing
-        app.config.from_pyfile('config_cchttpserver.py')
+        app.config.from_pyfile('config.py')
+        print (app.config)
     else:
         # load the test config if passed in
-        app.config['users'] = test_config['users']
-        app.config['dbdir'] = test_config['dbdir']
+        app.config['USERS'] = test_config['users']
+        app.config['DBDIR'] = test_config['dbdir']
 
-    users = app.config['users']
-    dbdir = app.config['dbdir']
+    users = app.config['USERS']
+    dbdir = app.config['DBDIR']
     store = CCFileStore(dbdir)
 
     @auth.get_password

config.py

@@ -1,8 +1,8 @@
 
 # users is a mapping of login-usernames to cleartext-passwords
-users = {
+USERS = {
     'test1': 'password1',
 }
 
 # dbdir is the directory where all blockserver state is stored
-dbdir = '/tmp/cchttpserver_dir'
+DBDIR = '/tmp/cchttpserver_dir'

test_ccfilestore.py

@@ -45,3 +45,5 @@ def test_delete_user(self, ds):
         ds.delete_user('user1')
         assert ds.get('a1') is None
         assert ds.get_user_keys('user1') == []
+        ds.delete_user("user1")
+        assert ds.get_user_keys('user1') == []

test_cchttpserver.py

@@ -28,7 +28,7 @@ def test_put_invalid_login(app):
     assert r.status_code == 401
 
 
-def test_put_and_get(app):
+def test_put_and_get_and_delete(app):
     for data in (b"123", b"456"):
         creds = base64.b64encode(b'a:pass').decode('utf-8')
         key = base64.b64encode(data).decode('utf-8')
@@ -49,6 +49,9 @@ def test_put_and_get(app):
         r = app.get('/' + key)
         assert r.status_code == 404
 
+    r = app.delete('/a/', headers={'Authorization': 'Basic ' + creds})
+    assert r.status_code == 200
+
 
 def test_indicate_repetition(app):
     data = b"123"