Skip to content

Commit

Permalink
fix bug in integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jcdlbs committed May 28, 2024
1 parent 369ecb2 commit 5c23e6a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions test/mirthsync/common_tests.clj
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"-i" "-f" "--include-configuration-map" "pull"))))

(testing "Pull diff from baseline has only inconsequential differences (ordering, etc)"
(is (= "" (diff "--recursive" "--suppress-common-lines" "-I" ".*<contextType>.*" "-I" ".*<time>.*" "-I" ".*<timezone>.*" "-I" ".*<revision>.*" repo-dir baseline-dir))))
(is (= "" (diff "--recursive" "--suppress-common-lines" "-I" ".*<contextType>.*" "-I" ".*<time>.*" "-I" ".*<timezone>.*" "-I" ".*<revision>.*" "-I" ".*<lastStatsTime>.*" repo-dir baseline-dir))))

(testing "Push back from pull dir succeeds without errors"
(is (= 0 (main-func "--include-configuration-map" "-s" "https://localhost:8443/api"
Expand All @@ -101,7 +101,7 @@
"-i" "-f" "--include-configuration-map" "pull"))))

(testing "Pull diff from baseline after multiple pushes has only inconsequential differences (ordering, etc)"
(is (= "" (diff "--recursive" "--exclude" ".DS_Store" "--suppress-common-lines" "-I" ".*<contextType>.*" "-I" ".*<time>.*" "-I" ".*<timezone>.*" "-I" ".*<revision>.*" repo-dir baseline-dir))))
(is (= "" (diff "--recursive" "--exclude" ".DS_Store" "--suppress-common-lines" "-I" ".*<contextType>.*" "-I" ".*<time>.*" "-I" ".*<timezone>.*" "-I" ".*<revision>.*" "-I" ".*<lastStatsTime>.*" repo-dir baseline-dir))))

(testing "Code template push fails wth changes and --force not enabled."
(is (= 1 (do
Expand Down Expand Up @@ -137,7 +137,7 @@
(main-func "-s" "https://localhost:8443/api"
"-u" "admin" "-p" "admin" "-t" repo-dir
"-i" "-m" "backup" "pull"))))
(is (= "" (diff "--exclude" ".DS_Store" "--suppress-common-lines" "-I" ".*<contextType>.*" "-I" ".*<time>.*" "-I" ".*<timezone>.*" "-I" ".*<revision>.*" (str repo-dir "/FullBackup.xml") (str baseline-dir "/../mirth-backup-" version ".xml"))))
(is (= "" (diff "--exclude" ".DS_Store" "--suppress-common-lines" "-I" ".*<contextType>.*" "-I" ".*<time>.*" "-I" ".*<timezone>.*" "-I" ".*<revision>.*" "-I" ".*<lastStatsTime>.*" (str repo-dir "/FullBackup.xml") (str baseline-dir "/../mirth-backup-" version ".xml"))))
(is (= 0 (do
(main-func "-s" "https://localhost:8443/api"
"-u" "admin" "-p" "admin" "-t" repo-dir
Expand All @@ -150,7 +150,7 @@
(main-func "-s" "https://localhost:8443/api"
"-u" "admin" "-p" "admin" "-t" repo-dir
"-i" "-m" "groups" "--include-configuration-map" "pull"))))
(is (= "" (diff "--exclude" ".DS_Store" "--recursive" "--suppress-common-lines" "-I" ".*<contextType>.*" "-I" ".*<time>.*" "-I" ".*<timezone>.*" "-I" ".*<revision>.*" repo-dir baseline-dir)))
(is (= "" (diff "--exclude" ".DS_Store" "--recursive" "--suppress-common-lines" "-I" ".*<contextType>.*" "-I" ".*<time>.*" "-I" ".*<timezone>.*" "-I" ".*<revision>.*" "-I" ".*<lastStatsTime>.*" repo-dir baseline-dir)))
(is (= 0 (do
(main-func "-s" "https://localhost:8443/api"
"-u" "admin" "-p" "admin" "-t" repo-dir
Expand Down

0 comments on commit 5c23e6a

Please sign in to comment.