fix the issue that the get workfile list can fetch ony 50 workfiles

Alpine Release · Alpine Release · commit d3cd69f55e20 · 2018-02-11T15:09:21.000+08:00
diff --git a/alpine/workfile.py b/alpine/workfile.py
@@ -52,8 +52,7 @@ def get_list(self, workspace_id, per_page=100):
         url = "{0}/workspaces/{1}/workfiles".format(self.base_url, str(workspace_id))
         url = self._add_token_to_url(url)
 
-        if self.session.headers.get("Content-Type") is not None:
-            self.session.headers.pop("Content-Type")
+        self.session.headers.update({"Content-Type": "application/json"})
         page_current = 0
         while True:
             payload = {"no_published_worklets": True,
@@ -242,6 +241,8 @@ def upload(self, workspace_id, afm_file, data_sources_list):
             payload.append(("workfile[execution_locations][{0}][id]".format(i), database_id))
 
         # files is used to create a multipart upload content-type with requests, we send in a file object
+        if self.session.headers.get("Content-Type") is not None:
+            self.session.headers.pop("Content-Type")
         files = {"workfile[versions_attributes][0][contents]": open(afm_file, 'rb')}
         self.logger.debug("POSTing to: {0}\n With payload: {1}".format(url, payload))
         response = self.session.post(url, files=files, data=payload, verify=False)
diff --git a/tests/api/test_job.py b/tests/api/test_job.py
@@ -43,7 +43,7 @@ def setUp(self):
 
         # Upload a DB flow
         base_dir = os.getcwd()
-        afm_path = "{0}/../data/afm/db_row_fil_with_variable.afm".format(base_dir)
+        afm_path = "{0}/data/afm/db_row_fil_with_variable.afm".format(base_dir)
         # afm_path = "db_bat_row_fil.afm"
         try:
             workfile_id = alpine_client.workfile.get_id("db_row_fil_with_variable", workspace_id)
diff --git a/tests/api/test_workfile.py b/tests/api/test_workfile.py
@@ -48,7 +48,7 @@ def setUp(self):
 
         # Upload a DB flow
         base_dir = os.getcwd()
-        afm_path = "{0}/../data/afm/db_row_fil_with_variable.afm".format(base_dir)
+        afm_path = "{0}/data/afm/db_row_fil_with_variable.afm".format(base_dir)
         # afm_path = "db_bat_row_fil.afm"
         try:
             workfile_id = alpine_client.workfile.get_id("db_row_fil_with_variable", workspace_id)
@@ -75,6 +75,36 @@ def test_get_workfiles_list(self):
         self.assertIsNotNone(workfile_list)
         self.assertEqual(workfile_list.__len__(), 1)
 
+    def test_get_workfiles_list_multiple_pages(self):
+        workspace_name_multiple_flows = "Workspace for Multiple Workfile Tests"
+        workspace_id_multiple_flows_count = 10
+
+        try:
+            workspace_id_multiple_flows = alpine_client.workspace.get_id(workspace_name_multiple_flows)
+            alpine_client.workspace.delete(workspace_id_multiple_flows)
+        except WorkspaceNotFoundException:
+            pass
+        workspace_info_nultiple_flow = alpine_client.workspace.create(workspace_name_multiple_flows)
+        workspace_id_multiple_flows = workspace_info_nultiple_flow['id']
+
+        # Upload DB flows
+        base_dir = os.getcwd()
+        afm_path = "{0}/data/afm/db_row_fil_with_variable.afm".format(base_dir)
+        database_list = alpine_client.datasource.get_database_list(db_datasource_id)
+        for database in database_list:
+            if database['name'] == "miner_demo":
+                database_id = database['id']
+        datasource_info = [{"data_source_type": DataSource.DSType.GreenplumDatabase,
+                            "data_source_id": db_datasource_id,
+                            "database_id": database_id
+                            }]
+        for i in range(0, workspace_id_multiple_flows_count):
+            workfile_info = alpine_client.workfile.upload(workspace_id_multiple_flows, afm_path, datasource_info)
+
+        workfile_list = alpine_client.workfile.get_list(workspace_id_multiple_flows,per_page=2)
+        self.assertIsNotNone(workfile_list)
+        self.assertEqual(workfile_list.__len__(), workspace_id_multiple_flows_count)
+
     def test_get_workfile_info(self):
         workfile_id = alpine_client.workfile.get_id("db_row_fil_with_variable", workspace_id)
         workfile_info = alpine_client.workfile.get(workfile_id)
@@ -132,7 +162,7 @@ def test_stop_workflow(self):
 
     def test_upload_hdfs_afm(self):
         base_dir = os.getcwd()
-        afm_path = "{0}/../data/afm/demo_hadoop_row_filter_regression.afm".format(base_dir)
+        afm_path = "{0}/data/afm/demo_hadoop_row_filter_regression.afm".format(base_dir)
         #afm_path = "demo_hadoop_row_filter_regression.afm"
         try:
             workfile_id = alpine_client.workfile.get_id("demo_hadoop_row_filter_regression", workspace_id)
@@ -147,7 +177,7 @@ def test_upload_hdfs_afm(self):
 
     def test_upload_db_afm(self):
         base_dir = os.getcwd()
-        afm_path = "{0}/../data/afm/db_bat_row_fil.afm".format(base_dir)
+        afm_path = "{0}/data/afm/db_bat_row_fil.afm".format(base_dir)
         #afm_path = "db_bat_row_fil.afm"
         try:
             workfile_id = alpine_client.workfile.get_id("db_bat_row_fil", workspace_id)
