summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2015-10-01 21:36:37 -0400
committerSimo Sorce <simo@redhat.com>2015-10-19 12:18:21 -0400
commit2380852ef8007cd9862d2db5f6af7e4e10bd6aad (patch)
tree3577a8d005c99e1d473eeadd0337793b508aeba1
parent9f9e8ab04f7478688d41c9bcb6ec3e3a7913fd8d (diff)
downloadcustodia-2380852ef8007cd9862d2db5f6af7e4e10bd6aad.zip
custodia-2380852ef8007cd9862d2db5f6af7e4e10bd6aad.tar.gz
custodia-2380852ef8007cd9862d2db5f6af7e4e10bd6aad.tar.xz
Use CustodiaClient in tests
Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Christian Heimes <cheimes@redhat.com>
-rw-r--r--tests/client.py21
-rw-r--r--tests/custodia.py90
2 files changed, 51 insertions, 60 deletions
diff --git a/tests/client.py b/tests/client.py
deleted file mode 100644
index 39dad61..0000000
--- a/tests/client.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2015 Custodia Project Contributors - see LICENSE file
-
-try:
- # pylint: disable=import-error
- from httplib import HTTPConnection
-except ImportError:
- # pylint: disable=import-error,no-name-in-module
- from http.client import HTTPConnection
-import socket
-
-
-class LocalConnection(HTTPConnection):
-
- def __init__(self, path):
- HTTPConnection.__init__(self, 'localhost', 0)
- self.unix_socket = path
-
- def connect(self):
- s = socket.socket(family=socket.AF_UNIX)
- s.connect(self.unix_socket)
- self.sock = s
diff --git a/tests/custodia.py b/tests/custodia.py
index f536dc3..54563d5 100644
--- a/tests/custodia.py
+++ b/tests/custodia.py
@@ -2,13 +2,14 @@
from __future__ import absolute_import
-import json
import os
import subprocess
import time
import unittest
-from tests.client import LocalConnection
+from requests.exceptions import HTTPError
+
+from custodia.client import CustodiaClient
class CustodiaTests(unittest.TestCase):
@@ -18,47 +19,58 @@ class CustodiaTests(unittest.TestCase):
env = os.environ.copy()
env['PYTHONPATH'] = './'
pexec = env.get('CUSTODIAPYTHON', 'python')
- devnull = open(os.devnull, "w")
- p = subprocess.Popen([pexec, 'custodia/custodia'], env=env,
- stdout=devnull, stderr=devnull)
+ try:
+ os.unlink('secrets.db')
+ except OSError:
+ pass
+ with (open('testlog.txt', 'a')) as logfile:
+ p = subprocess.Popen([pexec, 'custodia/custodia'], env=env,
+ stdout=logfile, stderr=logfile)
cls.custodia_process = p
time.sleep(1)
- cls.dfl_headers = {'REMOTE_USER': 'test',
- 'Content-Type': 'application/json'}
+ cls.client = CustodiaClient('http+unix://%2E%2Fserver_socket/secrets')
+ cls.client.headers['REMOTE_USER'] = 'test'
@classmethod
def tearDownClass(cls):
cls.custodia_process.kill()
cls.custodia_process.wait()
- for fname in ['server_socket', 'secrets.db']:
- try:
- os.unlink(fname)
- except OSError:
- pass
-
- def _make_request(self, cmd, path, headers=None, body=None):
- conn = LocalConnection('./server_socket')
- conn.connect()
- conn.request(cmd, path, body=body, headers=self.dfl_headers)
- return conn.getresponse()
-
- def test_connect(self):
- r = self._make_request('GET', '/', {'REMOTE_USER': 'tests'})
- self.assertEqual(r.status, 200)
-
- def test_simple_0_set_key(self):
- data = {'type': 'simple', 'value': 'VmVycnlTZWNyZXQK'}
- r = self._make_request('PUT', '/secrets/test/key',
- self.dfl_headers, json.dumps(data))
- self.assertEqual(r.status, 201)
-
- def test_simple_1_get_key(self):
- r = self._make_request('GET', '/secrets/test/key', self.dfl_headers)
- self.assertEqual(r.status, 200)
- body = r.read().decode('utf-8')
- data = {'type': 'simple', 'value': 'VmVycnlTZWNyZXQK'}
- self.assertEqual(json.loads(body), data)
-
- def test_simple_2_del_key(self):
- r = self._make_request('DELETE', '/secrets/test/key', self.dfl_headers)
- self.assertEqual(r.status, 204)
+ try:
+ os.unlink('server_socket')
+ except OSError:
+ pass
+
+ def test_0_create_container(self):
+ self.client.create_container('test/container')
+
+ def test_0_delete_container(self):
+ self.client.delete_container('test/container')
+
+ def test_1_set_simple_key(self):
+ self.client.set_simple_key('test/key', 'VmVycnlTZWNyZXQK')
+
+ def test_2_get_simple_key(self):
+ key = self.client.get_simple_key('test/key')
+ self.assertEqual(key, 'VmVycnlTZWNyZXQK')
+
+ def test_3_list_container(self):
+ r = self.client.list_container('test')
+ self.assertEqual(r.json(), ["key"])
+
+ def test_4_del_simple_key(self):
+ self.client.del_key('test/key')
+ try:
+ self.client.get_key('test/key')
+ except HTTPError as e:
+ self.assertEqual(e.response.status_code, 404)
+
+ def test_5_list_empty(self):
+ r = self.client.list_container('test')
+ self.assertEqual(r.json(), [])
+
+ def test_6_delete_container(self):
+ self.client.delete_container('test')
+ try:
+ self.client.list_container('test')
+ except HTTPError as e:
+ self.assertEqual(e.response.status_code, 404)