haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 15:19:06 +00:00
Code Issues Releases Wiki Activity

clean up test code

Browse Source
This commit is contained in:
Chilledheart
2014-08-27 17:13:05 +08:00
committed by lins05
parent a882caec03
commit 3044d2de20
6 changed files with 25 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/integration_api/__init__.py
View File

@@ -11,18 +11,16 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from common import common
from common.common import BASE_URL, USERNAME, PASSWORD
import requests, re
PING_URL = common.getBaseUrl() + u'/api2/ping/'
TOKEN_URL = common.getBaseUrl() + u'/api2/auth-token/'
AUTH_PING_URL = common.getBaseUrl() + u'/api2/auth/ping/'
PING_URL = BASE_URL + u'/api2/ping/'
TOKEN_URL = BASE_URL + u'/api2/auth-token/'
AUTH_PING_URL = BASE_URL + u'/api2/auth/ping/'
USERNAME = common.getUserName()
PASSWORD = common.getPassword()
META_AUTH = {'username': USERNAME, 'password': PASSWORD}
def getAuthToken():
def get_auth_token():
res = requests.post(TOKEN_URL, data=META_AUTH)
if (res.status_code != 200):
return None
@@ -31,8 +29,8 @@ def getAuthToken():
return None
return token
def getAuthedInstance():
token = getAuthToken()
def get_authed_instance():
token = get_auth_token()
if (token == None):
return None
s = requests.Session()