Updated ceph to 14.2.1

ceph-14.2.0-fix_tests.patch → ceph-14.2.1-fix_tests.patch

-diff -uNr ceph-14.2.0/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.0-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py
---- ceph-14.2.0/src/pybind/mgr/dashboard/tests/test_task.py	2019-03-18 20:38:29.000000000 +1030
-+++ ceph-14.2.0-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py	2019-06-11 15:32:06.593766060 +0930
-@@ -207,27 +207,6 @@
-         ex_t, _ = TaskManager.list('test5/*')
-         self.assertEqual(len(ex_t), 0)
+diff -uNr ceph-14.2.1/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.1-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py
+--- ceph-14.2.1/src/pybind/mgr/dashboard/tests/test_task.py	2019-04-26 03:45:48.000000000 +0930
++++ ceph-14.2.1-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py	2019-06-16 14:04:33.077065222 +0930
+@@ -177,57 +177,6 @@
+         self.assertEqual(str(fn_t[0].exception), "Task Unexpected Exception")
+         self.assertEqual(fn_t[0].progress, 70)
  
+-    def test_executing_tasks_list(self):
+-        task1 = MyTask(0, wait=True, progress=30)
+-        task2 = MyTask(0, wait=True, progress=60)
+-        state, result = task1.run('test5/task1', 0.5)
+-        self.assertEqual(state, TaskManager.VALUE_EXECUTING)
+-        self.assertIsNone(result)
+-        ex_t, _ = TaskManager.list('test5/*')
+-        self.assertEqual(len(ex_t), 1)
+-        self.assertEqual(ex_t[0].name, 'test5/task1')
+-        self.assertEqual(ex_t[0].progress, 30)
+-        state, result = task2.run('test5/task2', 0.5)
+-        self.assertEqual(state, TaskManager.VALUE_EXECUTING)
+-        self.assertIsNone(result)
+-        ex_t, _ = TaskManager.list('test5/*')
+-        self.assertEqual(len(ex_t), 2)
+-        for task in ex_t:
+-            if task.name == 'test5/task1':
+-                self.assertEqual(task.progress, 30)
+-            elif task.name == 'test5/task2':
+-                self.assertEqual(task.progress, 60)
+-        task2.resume()
+-        self.wait_for_task('test5/task2')
+-        ex_t, _ = TaskManager.list('test5/*')
+-        self.assertEqual(len(ex_t), 1)
+-        self.assertEqual(ex_t[0].name, 'test5/task1')
+-        task1.resume()
+-        self.wait_for_task('test5/task1')
+-        ex_t, _ = TaskManager.list('test5/*')
+-        self.assertEqual(len(ex_t), 0)
+-
 -    def test_task_idempotent(self):
 -        task1 = MyTask(0, wait=True)
 -        task1_clone = MyTask(0, wait=True)
@@ -29,9 +59,56 @@ diff -uNr ceph-14.2.0/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.0-fi
      def test_finished_cleanup(self):
          TaskManager.FINISHED_TASK_SIZE = 2
          TaskManager.FINISHED_TASK_TTL = 0.5
-diff -uNr ceph-14.2.0/src/test/CMakeLists.txt ceph-14.2.0-fix_tests/src/test/CMakeLists.txt
---- ceph-14.2.0/src/test/CMakeLists.txt	2019-03-18 20:38:29.000000000 +1030
-+++ ceph-14.2.0-fix_tests/src/test/CMakeLists.txt	2019-06-11 15:27:10.318847414 +0930
+@@ -264,46 +213,6 @@
+             self.assertEqual(task.name,
+                              "test7/task{}".format(len(fn_t)-idx+1))
+ 
+-    def test_task_serialization_format(self):
+-        task1 = MyTask(0, wait=True, progress=20)
+-        task2 = MyTask(1)
+-        task1.run('test8/task1', 0.5)
+-        task2.run('test8/task2', 0.5)
+-        self.wait_for_task('test8/task2')
+-        ex_t, fn_t = TaskManager.list_serializable('test8/*')
+-        self.assertEqual(len(ex_t), 1)
+-        self.assertEqual(len(fn_t), 1)
+-
+-        try:
+-            json.dumps(ex_t)
+-        except ValueError as ex:
+-            self.fail("Failed to serialize executing tasks: {}".format(str(ex)))
+-
+-        try:
+-            json.dumps(fn_t)
+-        except ValueError as ex:
+-            self.fail("Failed to serialize finished tasks: {}".format(str(ex)))
+-
+-        # validate executing tasks attributes
+-        self.assertEqual(len(ex_t[0].keys()), 4)
+-        self.assertEqual(ex_t[0]['name'], 'test8/task1')
+-        self.assertEqual(ex_t[0]['metadata'], task1.metadata())
+-        self.assertIsNotNone(ex_t[0]['begin_time'])
+-        self.assertEqual(ex_t[0]['progress'], 20)
+-        # validate finished tasks attributes
+-        self.assertEqual(len(fn_t[0].keys()), 9)
+-        self.assertEqual(fn_t[0]['name'], 'test8/task2')
+-        self.assertEqual(fn_t[0]['metadata'], task2.metadata())
+-        self.assertIsNotNone(fn_t[0]['begin_time'])
+-        self.assertIsNotNone(fn_t[0]['end_time'])
+-        self.assertGreaterEqual(fn_t[0]['duration'], 1.0)
+-        self.assertEqual(fn_t[0]['progress'], 100)
+-        self.assertTrue(fn_t[0]['success'])
+-        self.assertTaskResult(fn_t[0]['ret_value'])
+-        self.assertIsNone(fn_t[0]['exception'])
+-        task1.resume()
+-        self.wait_for_task('test8/task1')
+-
+     def test_fast_async_task(self):
+         task1 = MyTask(1, is_async=True)
+         state, result = task1.run('test9/task1')
+diff -uNr ceph-14.2.1/src/test/CMakeLists.txt ceph-14.2.1-fix_tests/src/test/CMakeLists.txt
+--- ceph-14.2.1/src/test/CMakeLists.txt	2019-04-26 03:45:48.000000000 +0930
++++ ceph-14.2.1-fix_tests/src/test/CMakeLists.txt	2019-06-16 13:48:11.863870417 +0930
 @@ -528,6 +528,7 @@
  
  if(WITH_RBD)
@@ -40,9 +117,9 @@ diff -uNr ceph-14.2.0/src/test/CMakeLists.txt ceph-14.2.0-fix_tests/src/test/CMa
    if(FREEBSD)
      add_ceph_test(rbd-ggate.sh ${CMAKE_CURRENT_SOURCE_DIR}/rbd-ggate.sh)
    endif(FREEBSD)
-diff -uNr ceph-14.2.0/src/test/mgr/CMakeLists.txt ceph-14.2.0-fix_tests/src/test/mgr/CMakeLists.txt
---- ceph-14.2.0/src/test/mgr/CMakeLists.txt	2019-03-18 20:38:29.000000000 +1030
-+++ ceph-14.2.0-fix_tests/src/test/mgr/CMakeLists.txt	2019-06-11 15:28:46.037144204 +0930
+diff -uNr ceph-14.2.1/src/test/mgr/CMakeLists.txt ceph-14.2.1-fix_tests/src/test/mgr/CMakeLists.txt
+--- ceph-14.2.1/src/test/mgr/CMakeLists.txt	2019-04-26 03:45:48.000000000 +0930
++++ ceph-14.2.1-fix_tests/src/test/mgr/CMakeLists.txt	2019-06-16 13:48:11.863870417 +0930
 @@ -2,6 +2,7 @@
  if(WITH_MGR_DASHBOARD_FRONTEND)
    if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")