Merge branch 'develop' into debian/jessie

Preparing debian/changelog for next release.
perfsonar · Mar 6, 2016 · 5a296f3 · 5a296f3
2 parents 24f4bbc + a2ad901
commit 5a296f3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+esmond (2.0.2~beta-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Antoine Delvaux <adelvaux@man.poznan.pl>  Sun, 06 Mar 2016 13:21:56 +0100
+
 esmond (2.0.1~beta-1) perfsonar-jessie-release; urgency=low
 
   * New upstream version.

diff --git a/esmond/api/tests/perfsonar/test_api.py b/esmond/api/tests/perfsonar/test_api.py
@@ -440,7 +440,7 @@ def test_post_metadata_list(self):
         self.assertHttpUnauthorized(self.get_api_client().post(url, format='json', data=self.post_data))
 
         #test with credentials with no permissions
-        self.assertHttpForbidden(self.get_api_client(noperm_auth=True).post(url, format='json', data=self.post_data))
+        #self.assertHttpForbidden(self.get_api_client(noperm_auth=True).post(url, format='json', data=self.post_data))
 
         #test with credentials with permissions
         response = self.get_api_client(admin_auth=True).post(url, format='json', data=self.post_data)
@@ -797,8 +797,9 @@ def test_post_histogram_data(self):
 
     def test_authentication_failures(self):
         base_url = '/{0}/archive/f6b732e9f351487a96126f0c25e5e546/throughput/base/'.format(PS_ROOT)
-        self.assertAuthFailure(base_url, 1398965989, self.int_data[0], False)
-        self.assertAuthFailure(base_url, 1398965989, self.int_data[0], True)
+        self.assertAuthFailure(base_url, 1398965990, self.int_data[0], False)
+        #No longer use Django permissions so deactivated below
+        #self.assertAuthFailure(base_url, 1398965990, self.int_data[0], True)
 
     def test_ip_auth(self):
         base_url = '/{0}/archive/f6b732e9f351487a96126f0c25e5e546/throughput/base/'.format(PS_ROOT)