Switch to pytest and remove relative pathing

Author: rliebz

dataverse/connection.py

@@ -14,7 +14,6 @@ def __init__(self, host, token):
         self.host = host
         self.sd_uri = "https://{host}/dvn/api/data-deposit/v1.1/swordv2/service-document".format(host=self.host)
         self.service_document = None
-        self.connected = False
 
         self.connect()
 
@@ -31,7 +30,6 @@ def connect(self):
             raise ConnectionError('Could not connect to the Dataverse')
 
         self.service_document = etree.XML(resp.content)
-        self.connected = True
 
     def get_dataverses(self, refresh=False):
         if refresh:

dataverse/settings/defaults.py

@@ -1,6 +1,11 @@
-TEST_HOST = "dataverse-demo.iq.harvard.edu"
+import os
+
+TEST_HOST = "apitest.dataverse.org"
 TEST_TOKEN = "changeme"
 
+HERE = os.path.dirname(os.path.abspath(__file__))
+BASE_PATH = os.path.abspath(os.path.join(HERE, os.pardir))
+
 EXAMPLE_DICT = {
     "title": "ExampleTitle",
     "id": "ExampleID",

dataverse/test/config.py

@@ -1,9 +1,16 @@
+import os
+from dataverse.settings import BASE_PATH
+
 PICS_OF_CATS_DATASET = {
     "id": "1",
     "title": "This Study is about Pictures of Cats",
     "author": "Peter Bull",
     "description": "In this study we prove there can be pictures of cats.",
 }
 
-ATOM_DATASET = "../resources/atom-entry-study.xml"
+ATOM_DATASET = os.path.join(BASE_PATH, 'resources', 'atom-entry-study.xml')
 
+EXAMPLE_FILES = [
+    os.path.join(BASE_PATH, 'test', '__init__.py'),
+    os.path.join(BASE_PATH, 'test', 'config.py'),
+]

dataverse/test/test_dataverse.py

@@ -1,16 +1,17 @@
 import unittest
 
-import logging
-logging.basicConfig(level=logging.ERROR)
+import httpretty
 
-# local modules
 from dataverse.connection import Connection
 from dataverse.dataset import Dataset
-from dataverse.exceptions import DataverseError
 from dataverse.settings import TEST_HOST, TEST_TOKEN
-from dataverse.test.config import PICS_OF_CATS_DATASET, ATOM_DATASET
+from dataverse.test.config import PICS_OF_CATS_DATASET, ATOM_DATASET, EXAMPLE_FILES
+from dataverse import exceptions
 from dataverse import utils
 
+import logging
+logging.basicConfig(level=logging.ERROR)
+
 
 class TestUtils(unittest.TestCase):
 
@@ -54,6 +55,31 @@ def test_format_term_replace(self):
         self.assertEqual(formatted_term, '{http://purl.org/dc/terms/}identifier')
 
 
+class TestConnection(unittest.TestCase):
+
+    def test_connect(self):
+        c = Connection(TEST_HOST, TEST_TOKEN)
+
+        self.assertEqual(c.host, TEST_HOST)
+        self.assertEqual(c.token, TEST_TOKEN)
+        self.assertTrue(c.service_document)
+
+    def test_connect_unauthorized(self):
+        with self.assertRaises(exceptions.UnauthorizedError):
+            Connection(TEST_HOST, 'wrong-token')
+
+    @httpretty.activate
+    def test_connect_unknown_failure(self):
+        httpretty.register_uri(
+            httpretty.GET,
+            "https://{host}/dvn/api/data-deposit/v1.1/swordv2/service-document".format(host=TEST_HOST),
+            status=400,
+        )
+
+        with self.assertRaises(exceptions.ConnectionError):
+            Connection(TEST_HOST, TEST_TOKEN)
+
+
 class TestDataset(unittest.TestCase):
 
     def test_init(self):
@@ -98,7 +124,7 @@ def setUpClass(self):
         print "Getting Dataverse"
         dataverses = self.dvc.get_dataverses()
         if not dataverses:
-            raise DataverseError(
+            raise exceptions.DataverseError(
                 'You must have a Dataverse to run these tests.'
             )
 
@@ -136,10 +162,10 @@ def test_create_dataset_from_xml(self):
         self.dv.delete_dataset(retrieved_dataset)
 
     def test_add_files(self):
-        self.s.add_files(['test_dataverse.py', 'config.py'])
+        self.s.add_files(EXAMPLE_FILES)
         actual_files = [f.name for f in self.s.get_files()]
 
-        self.assertIn('test_dataverse.py', actual_files)
+        self.assertIn('__init__.py', actual_files)
         self.assertIn('config.py', actual_files)
 
     def test_upload_file(self):

readme.md

@@ -33,12 +33,12 @@ files = dataset.get_files('latest')
 
 ### Configuration
 
-Create a file at `settings/local.py`. The file should contain the following
+Create a file at `dataverse/settings/local.py`. The file should contain the following
 information:
 
 ```python
-DEFAULT_HOST = "apitest.dataverse.org"
-DEFAULT_TOKEN = "" # Token can be generated at {host}/account/apitoken
+TEST_HOST = "apitest.dataverse.org"
+TEST_TOKEN = "" # Token can be generated at {host}/account/apitoken
 ```
 
 Do not commit this file.
@@ -50,5 +50,4 @@ host you wish to test. Do not run tests on the production server.
 
 To run tests:
 
-    $ cd dataverse/test
-    $ python -m unittest test_dataverse
+    $ py.test

setup.py

@@ -6,11 +6,12 @@
 REQUIRES = [
     'bleach>=1.2.2',
     'requests>=2.2.1',
-    'lxml>=3.2.5'
+    'lxml>=3.2.5',
 ]
 
 TEST_REQUIRES = [
-
+    'httpretty>=0.8.8',
+    'pytest>=2.7.0',
 ]