Fix path to artifacts in python ci tests.

arssher · arssher · commit 0df4d884afc1 · 2021-03-18T19:23:32.000+03:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -105,9 +105,9 @@ recovery_random:
   artifacts:
     when: on_failure
     paths:
-      - contrib/mmts/tests/logs1
-      - contrib/mmts/tests/logs2
-      - contrib/mmts/tests/logs3
+      - tests/logs1
+      - tests/logs2
+      - tests/logs3
   variables:
     <<: *docker_variables
   before_script:
@@ -123,9 +123,9 @@ referee:
   stage: referee
   artifacts:
     paths:
-      - contrib/mmts/tests/logs1
-      - contrib/mmts/tests/logs2
-      - contrib/mmts/tests/logs_referee
+      - tests/logs1
+      - tests/logs2
+      - tests/logs_referee
   script:
     - tar -xzvf docker-image/pgmm.tar.gz
     - docker load -i docker-image/pgmm.tar
diff --git a/tests/lib/log_helper.py b/tests/lib/log_helper.py
@@ -16,7 +16,7 @@ class UTCFormatter(logging.Formatter):
 	"defaultFormatter": {
 	    "()": UTCFormatter,
 	    "format": "%(asctime)s.%(msecs)-3d %(levelname)s [%(filename)s:%(lineno)d] %(message)s",
-	    "datefmt": "%Y-%m-%d:%H:%M:%S"
+	    "datefmt": "%Y-%m-%d %H:%M:%S"
 	}
     },
     "handlers": {
diff --git a/tests/lib/test_helper.py b/tests/lib/test_helper.py
@@ -176,7 +176,6 @@ def awaitCommit(self, node_id):
 
         raise AssertionError('awaitCommit on node {} exceeded timeout {}'.format(node_id, TEST_MAX_RECOVERY_TIME))
 
-    # if write is true, make writing xact
     @staticmethod
     def awaitOnline(dsn, mm_ping=False):
         total_sleep = 0

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class UTCFormatter(logging.Formatter):`
`16`	`16`	`"defaultFormatter": {`
`17`	`17`	`"()": UTCFormatter,`
`18`	`18`	`"format": "%(asctime)s.%(msecs)-3d %(levelname)s [%(filename)s:%(lineno)d] %(message)s",`
`19`		`- "datefmt": "%Y-%m-%d:%H:%M:%S"`
	`19`	`+ "datefmt": "%Y-%m-%d %H:%M:%S"`
`20`	`20`	`}`
`21`	`21`	`},`
`22`	`22`	`"handlers": {`