Merge branch 'feature/jipeihong' into 'master'

add requirements.txt See merge request !14

Merge branch 'feature/jipeihong' into 'master'
add requirements.txt See merge request !14
季培红
2 parents 6a893254 9b332522
Showing 12 changed files with 43 additions and 9 deletions
atdd/MobilePost.py
requirements.txt
tests/Staff_Management/AdminSettings/test_jobSetting.py → tests/Staff_Management/AdminSettings/Job_setting/test_jobSetting.py
tests/Staff_Management/AdminSettings/public_adminSettings.py → tests/Staff_Management/AdminSettings/Public/public_adminSettings.py
tests/Staff_Management/AdminSettings/test_roleSetting.py → tests/Staff_Management/AdminSettings/Role_setting/test_roleSetting.py
tests/Staff_Management/AdminSettings/Synchronous_address_book/test_synchronous.py
tests/Staff_Management/Invite/test_Invitation_authority.py
tests/Staff_Management/MemberList/JobList/get_jobid.py
tests/Staff_Management/MemberList/JobList/test_delete_job.py
tests/Staff_Management/Organization/public_org.py
tests/Staff_Management/Organization/test_add_org.py
tests/Staff_Management/Organization/tets_edit_org.py
@@ -23,8 +23,7 @@ class MobilePost(ATDDCase):
  
  
     # 手机端接口模板
-    def MobilePost(self, interfaceUrl, data=None, **options):
-
+    def mobile_post(self, interfaceUrl, data=None, **options):
         self.interfaceUrl = interfaceUrl
         self.data = data
  
@@ -36,7 +35,7 @@ class MobilePost(ATDDCase):
         self.assertEquals(0, errcode)
         return result
  
-    # 后端接口模板-异常判断
+    # 手机端接口模板-异常判断
     def MobilePostAbnormal(self, interfaceUrl, data=None, code=None, **options):
         self.interfaceUrl = interfaceUrl
         self.data = data
+argh==0.26.2
+asn1crypto==0.22.0
+certifi==2017.4.17
+cffi==1.10.0
+chardet==3.0.4
+colorama==0.3.9
+coverage==4.4.1
+cryptography==1.9
+idna==2.5
+ndg-httpsclient==0.4.2
+nose==1.3.7
+nose2==0.6.5
+pathtools==0.1.2
+py==1.4.34
+pyasn1==0.2.3
+pycparser==2.18
+pyOpenSSL==17.1.0
+pytest==3.1.3
+PyYAML==3.12
+reload==0.9
+requests==2.18.1
+six==1.10.0
+urllib3==1.21.1
+watchdog==0.8.3
-from atdd.PcPost import PcPost
-from tests.Staff_Management.AdminSettings.test_jobSetting import JobSetting
-from tests.Staff_Management.AdminSettings.test_roleSetting import RoleSetting
 import random
  
+from AdminSettings.Job_setting.test_jobSetting import JobSetting
+from AdminSettings.Role_setting.test_roleSetting import RoleSetting
+from atdd.PcPost import PcPost
+
+
 class InvitationAuth(PcPost):
  
     interfaceUrl = "/Public/Apicp/ChooseMem/ConfirmChoose"
@@ -17,7 +17,7 @@ class JobId(PcPost):
         for i in range(len(resultlist)):  # 通过序列索引进行遍历 len返回元素个数
             jobId = result['result']['list'][i]['jobId'].split()   # 切片取出元素
             jobIdlist[len(jobIdlist):len(jobIdlist)] = jobId
-        # print(jobIdlist)
+        print(jobIdlist)
         return jobIdlist
  
     def test_get_1jobid(self):
@@ -11,7 +11,9 @@ class DeleteJob(PcPost):
  
     # 删除岗位
     def test_deletejob(self):
-        jobId = JobId().test_get_1jobid()
+        IDjob = JobId()
+        IDjob.setUp()
+        jobId = IDjob.test_get_1jobid()
         data = {
             'jobId': jobId  # 参数化
         }
@@ -7,6 +7,7 @@ class PulbicOrg(PcPost):
  
     # 获取顶级部门的ID
     def get_top_org(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
         url = "/Contact/Apicp/Department/List"
         data = {
             "_identifier": 'contact',
@@ -18,6 +19,7 @@ class PulbicOrg(PcPost):
  
     # 查找某一个部门以及其子部门的dpId,以list格式返回
     def get_all_dpId(self,dpParentId):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
         data = {
             "dpParentId":dpParentId
         }
@@ -32,6 +34,7 @@ class PulbicOrg(PcPost):
  
     # 获取组织下的人员总数
     def get_org_user_total(self,dpParentId):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
         data = {
             "dpParentId": dpParentId
         }
@@ -41,6 +44,7 @@ class PulbicOrg(PcPost):
  
     # 随机取一个部门，返回部门ID
     def get_random_dptId(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
         top_Id = self.get_top_org()
         dpId_all = self.get_all_dpId(top_Id)  # 所有部门的dpId
         x = random.randint(0, len(dpId_all) - 1)  # 在所有部门中随机取一个部门
@@ -34,6 +34,9 @@ class AddOrg(PcPost):
     def test_add_mendian(self):
         x = random.randint(0,1000)
         top_dpId = PulbicOrg().get_top_org()
+        # publicOrg = PulbicOrg()
+        # publicOrg.setUp()
+        # top_dpId = publicOrg.get_top_org()
         data = {
             "department_id": None,
             "parent_id": top_dpId, # 顶级部门
@@ -11,7 +11,7 @@ class EditOrg(PcPost):
         self.do_login(self.host, self.mobile, self.psw, self.domain)
  
     def test_edit_query(self):
-        # 随机取一个部门ID
+        # 随机取一个部门ID，判断业务正确性
         dptId = PulbicOrg().get_random_dptId()
  
         data = {