Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt syncthingctl tests to latest changes

This commit is contained in:
Martchus 2023-01-28 20:40:00 +01:00
parent 4d96f791b6
commit c4eee6bc27
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/testfiles/expected-status.txt
View File

@ -8,8 +8,8 @@ Overall statistics
Version syncthing v.* Version syncthing v.*
Directories Directories
- test2 - Test dir 2
Label Test dir 2 ID test2
Path /tmp/some/path/2/ Path /tmp/some/path/2/
Status paused Status paused
Shared with Test dev 2 Shared with Test dev 2

6
cli/tests/application.cpp
View File

@ -166,7 +166,7 @@ void ApplicationTests::test()
const char *const statusDirsOnlyArgs[] = { "syncthingctl", "status", "--all-dirs", nullptr }; const char *const statusDirsOnlyArgs[] = { "syncthingctl", "status", "--all-dirs", nullptr };
TESTUTILS_ASSERT_EXEC(resumeArgs); TESTUTILS_ASSERT_EXEC(resumeArgs);
TESTUTILS_ASSERT_EXEC(statusDirsOnlyArgs); TESTUTILS_ASSERT_EXEC(statusDirsOnlyArgs);
CPPUNIT_ASSERT(stdout.find(" - test2") != string::npos); CPPUNIT_ASSERT(stdout.find(" - Test dir 2") != string::npos);
CPPUNIT_ASSERT(stdout.find("paused") == string::npos); CPPUNIT_ASSERT(stdout.find("paused") == string::npos);
// test pause, verify via status on specific dir // test pause, verify via status on specific dir
@ -177,7 +177,7 @@ void ApplicationTests::test()
TESTUTILS_ASSERT_EXEC(statusTest2Args); TESTUTILS_ASSERT_EXEC(statusTest2Args);
cout << stdout; cout << stdout;
CPPUNIT_ASSERT(stdout.find(" - test1") == string::npos); CPPUNIT_ASSERT(stdout.find(" - test1") == string::npos);
CPPUNIT_ASSERT(stdout.find(" - test2") != string::npos); CPPUNIT_ASSERT(stdout.find(" - Test dir 2") != string::npos);
CPPUNIT_ASSERT(stdout.find("paused") != string::npos); CPPUNIT_ASSERT(stdout.find("paused") != string::npos);
// test cat // test cat
@ -201,7 +201,7 @@ void ApplicationTests::test()
TESTUTILS_ASSERT_EXEC(statusTest1Args); TESTUTILS_ASSERT_EXEC(statusTest1Args);
cout << stdout; cout << stdout;
CPPUNIT_ASSERT(stdout.find(" - test1") != string::npos); CPPUNIT_ASSERT(stdout.find(" - test1") != string::npos);
CPPUNIT_ASSERT(stdout.find(" - test2") == string::npos); CPPUNIT_ASSERT(stdout.find(" - Test dir 2") == string::npos);
CPPUNIT_ASSERT(stdout.find("Rescan interval file system watcher and periodic rescan disabled") != string::npos); CPPUNIT_ASSERT(stdout.find("Rescan interval file system watcher and periodic rescan disabled") != string::npos);
#endif #endif