1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00

4036 Commits

Author SHA1 Message Date
Martin Schwenke
bf197d097f tests: Rename ctdb_test_functions.bash to integration.bash
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 79adb50b3ce3873c3baf9e6715c1d1c3f181ce43)
2012-04-27 15:40:43 +10:00
Ronnie Sahlberg
4426f9a531 Merge remote branch 'amitay/tdb-sync'
(This used to be ctdb commit 8052ee0a6bda3fa88501d77b2d53315be2b75ec1)
2012-04-26 08:09:34 +10:00
Ronnie Sahlberg
db411aaada Merge remote branch 'amitay/tevent-sync'
(This used to be ctdb commit 17ff3f240b0d72c72ed28d70fb9aeb3b20c80670)
2012-04-26 08:09:23 +10:00
Ronnie Sahlberg
58e10b280d Merge remote branch 'amitay/talloc-sync'
(This used to be ctdb commit fdd5b9ac0a79f6bc7c8a05da2e2f11e002392bcd)
2012-04-26 08:09:05 +10:00
Ronnie Sahlberg
618d247420 Merge remote branch 'martins/master'
(This used to be ctdb commit abe7ebe6c531f912efe4ebc1daade4d2af67574c)
2012-04-18 13:48:43 +10:00
Martin Schwenke
116f19b808 tests: More unit test factoring/rationalisation and bug fixes
Move some options from eventscripts/run_tests.sh to scripts/run_tests.
Remove the former.

Move some functions from eventscripts/scripts/local.sh to
scripts/unit.sh.

Both of these are modified during move so they are no longer
eventscript-specific.

Tweak */local.sh so that the new functions in unit.sh are used.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 7ff485687891732074c9fc9998502ca197663d02)
2012-04-18 10:37:45 +10:00
Martin Schwenke
6e05811c28 tests/eventscripts: Share directories must be absolute in eventscript tests
This fixes eventscripts/scripts/local.sh:setup_generic() so that
directories listed in $FAKE_SHARES are absolute instead of potentially
relative (and, therefore, ignored by the NFS share check).

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 8544162b7a4efa23c92bc0d2774df95bb7f0f463)
2012-04-18 10:35:25 +10:00
Martin Schwenke
aaa6565977 tests/eventscripts: Tweak an error message in a policy routing test
It currently has my home directory pasted into it.  That can't be
right...  ;-)

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 5d6e71cf6e1e0665ec96e7e4e2cfd31f40ebabae)
2012-04-17 12:57:46 +10:00
Martin Schwenke
feff13ff63 tests - run_tests needs to expand directories like "." and "..".
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit fd08fc6c88cb80190ce87325867de0391cf1af51)
2012-04-16 16:27:20 +10:00
Martin Schwenke
df39a671db tests/eventscripts - Restructure according to new convention
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit eb13507713ba6732271b7c3024bfddbda6da5ffc)
2012-04-16 16:24:12 +10:00
Martin Schwenke
a35eca8bda tests - run_tests ignores trailing '/' on directories
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit dbec696930327ff07b39282e3084eef4ded064c0)
2012-04-16 15:58:44 +10:00
Martin Schwenke
76d75f8c81 tests/takeover - Restructure according to new convention
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit f94897ef9504c144937409688fa7a646e0b0ceae)
2012-04-16 15:57:16 +10:00
Martin Schwenke
8c5fdb40cf tests/onnode - Restructure according to new convention
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 4c87888b2a559c0d1f285919a42de450a537a02f)
2012-04-16 15:57:16 +10:00
Martin Schwenke
006b18dec4 tests/tool - Restructure according to new convention
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 89571585d87b391ff79647cd1f0f6ac193079e72)
2012-04-16 15:06:48 +10:00
Amitay Isaacs
612f0d91d2 tests/tool: New nodestatus test
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit ca9e75eaea9c9b02bb44ca338e28fdae0c8d582c)
2012-04-16 15:04:43 +10:00
Amitay Isaacs
1d7f023f1a tests/tool: Fix the nodestatus test
Although not obvious, when asking each node for nodestatus, it will report
each node is the current node.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit a65ba7211ec7f102b32060b173606a61fb5c20a9)
2012-04-16 15:02:49 +10:00
Martin Schwenke
8e71c5ec90 tests - run_tests includes common.sh, uses die()
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 21df43c74bfcff420fdaf9df5440c25529c543d2)
2012-04-16 14:57:45 +10:00
Martin Schwenke
9267727edb tests - run_tests can take a directory as an argument
This makes it run all tests in the specified directory.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 89719384a74161ffa0c03602ecdd9e758d521d75)
2012-04-16 14:57:45 +10:00
Martin Schwenke
6eb8bf776e tests - add -v option to set TEST_VERBOSE=true
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 43badc5418b9f533398cd579607d9f1fc0f8f417)
2012-04-16 14:57:45 +10:00
Martin Schwenke
fec6fe6287 tests - move functions only used by scripts/run_tests into that script
Along with minor logic tweaks and removal of test_exit().

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 00713eb46cce638339845799bba2da041b3d02fb)
2012-04-16 14:57:45 +10:00
Martin Schwenke
f6178fcc9d tests - add scripts/unit.sh
This will be sourced by all unit tests.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit afdaa5f032938d56ff315d9553cb285ebc413c4c)
2012-04-16 14:57:45 +10:00
Martin Schwenke
2c141e6c05 tests - add scripts/common.sh
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit a7ad94fe9f2e773567dbb6500469dd2dd2f2f04b)
2012-04-16 14:57:45 +10:00
Martin Schwenke
a530358b2f tests - export new variable TEST_SCRIPTS_DIR
This replaces previous script-local variable ctdb_test_scripts_dir.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 107b465172205cb304549fcffaf36b9416696c15)
2012-04-16 14:57:44 +10:00
Martin Schwenke
e5f5a101ee Tests - IP allocation - 2 tests for NODE_FLAGS_NOIPTAKEOVER
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit fa54a1095a7504863ed30bff8e0828a8be6dde55)
2012-04-16 14:57:44 +10:00
Martin Schwenke
39317325f5 Tests - IP allocation - add another LCP2 test based on a test failure
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 89e322562f25dcb8d84357a19e71b2272b2f29a8)
2012-04-16 14:57:44 +10:00
Martin Schwenke
d4785e813a Tests - turn of time logging by default
We haven't seen problems related to time jumps for a long time.  Turn
this off by default.

To switch it back on set $CTDB_TEST_TIME_LOGGING to any non-null
value.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 2aa9bbf3a52dde0707eb06acd91e57c8da5c717f)
2012-04-16 14:57:44 +10:00
Amitay Isaacs
8f643897bb lib/tdb: Sync tdb from samba git tree
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 0f40ea2386892ae10b30beeded0e00edf4c019c3)
2012-04-13 17:49:03 +10:00
Amitay Isaacs
d6383c3ca5 lib/tdb: Remove the files required to build tdb as a library
Since tdb library will never be built from ctdb sources, we don't need the build
related files.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit a7aace3d165e6cb7d63950107e584edaee12a357)
2012-04-13 17:44:56 +10:00
Amitay Isaacs
83015a11cc lib/talloc: Sync talloc from samba git tree
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 670ebada4bafe79bd535c9bb5cc2d5d49d646af3)
2012-04-13 17:28:51 +10:00
Amitay Isaacs
25a7c32930 lib/talloc: Remove the files required to build talloc as a library
Since talloc library will never be built from ctdb sources, we don't need the
build related files.

(This used to be ctdb commit 2cd6a7ce648c1d2cc4d5580c3809858c100fa930)
2012-04-13 17:28:51 +10:00
Amitay Isaacs
195cf3c87e lib/tevent: Sync tevent from samba git tree
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 483459c79884891b3639a8bb865d5e8318cde98c)
2012-04-13 17:28:15 +10:00
Amitay Isaacs
f16a180f6f lib/tevent: Remove the files required to build tevent as a library
Since we are not going to build tevent library from ctdb source, remote build
related files.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit efbb7e0b9dcde547b46efd8e3b26c571e4fcf893)
2012-04-13 17:28:15 +10:00
Amitay Isaacs
3381b597d6 lib/tevent: Remove local modifications to tevent
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit d1bc4a97ea649f5a07802178591688e438313ff8)
2012-04-13 17:28:14 +10:00
Amitay Isaacs
a6abfa28cf ctdb_test: Remove faked wrappers for tevent functions in stub testing
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 74539cc619b17ea187e34b5866869212896b0c1a)
2012-04-13 17:28:14 +10:00
Amitay Isaacs
4392591555 Remove explicit include of lib/tevent/tevent.h.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 0681014ca5ed2a9b56f63fdace7f894beccf8a9a)
2012-04-13 17:28:14 +10:00
Amitay Isaacs
131d35d67d includes: Move special tevent defines from tevent.h to includes.h
This allows to build against system tevent library. Also include tevent header
along with other common headers.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 9ae4389c2c959c5dcd8395fdae2b25ed7e1e873a)
2012-04-13 17:28:14 +10:00
Amitay Isaacs
b3d098ced7 ctdbd: Fix spurious warnings when running with --nopublicipcheck
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 67b909a0718d6cfce82ffce0830da3a6ff1f6c4b)
2012-04-13 15:38:11 +10:00
Amitay Isaacs
202791cf72 recoverd: Fix spurious warnings when running with --nopublicipcheck
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 7f8096f56d8274151705ac822b582d972078f8fe)
2012-04-13 15:38:11 +10:00
Amitay Isaacs
ad4d5263e7 tests: Use CTDB_TEST_REAL_CLUSTER to decide if tests use local daemons
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit d5b2ad651495f32091bd33d30871638de0de633a)
2012-04-13 14:51:13 +10:00
Amitay Isaacs
68ae5f7a3e tests: Set the debug level = 3 when running local tests
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit b86b947797c51e3576c6b34f547434c3f0aa36f3)
2012-04-13 14:51:13 +10:00
Amitay Isaacs
f2a5fda861 tests: Check assigned IPs from ctdb output
This fixes the test ctdb_config_add_ip when running against local daemons.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit b81c2c8a2360001fe73f9fd9aa1ba32665fdb0bb)
2012-04-13 14:51:13 +10:00
Amitay Isaacs
db13fd893c tests: Check for assigned IP addresses only if we are on real cluster
This fixes the ctdb_ip test when running against local daemons.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit a108fc14d90b6d552736d19b0ea104f2508dc331)
2012-04-13 14:51:13 +10:00
Amitay Isaacs
425b8768ee ctdbd: Fix the error message string
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 15f63ebab9686734f41a6adf38d4a7faa919ac66)
2012-04-13 14:51:13 +10:00
Amitay Isaacs
615d543cc6 tests: Fix the error messages in test event script
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 706e6e3ef6765fbba29e531e590c48fe742b9914)
2012-04-13 14:51:13 +10:00
Amitay Isaacs
ea1c89566e tests: Add regular expression parsing for hop_count_buckets
This fixes the test to check ctdb statistics output.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 98c633ab4824e0e4d28ab2eb2532e16eb859bd94)
2012-04-13 14:51:13 +10:00
Amitay Isaacs
dbe7fa9ff0 tests: Add a script to run cluster tests and make target "test_cluster"
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 420a10be89c62b4d605f3b972d78fd69dd9f5bb1)
2012-04-13 14:51:13 +10:00
Amitay Isaacs
926f656580 tests: exportfs always outputs with options in brackets
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit bdd8b8ab20169936fa723fa77cead1b76b6cd0b5)
2012-04-13 14:51:13 +10:00
Amitay Isaacs
c985ccf411 tests/tool: New nodestatus test
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 902d8a4709e7a269d2a75522a998f9a60ae13d78)
2012-04-13 12:07:01 +10:00
Amitay Isaacs
2119438496 tests/tool: Fix the nodestatus test
Although not obvious, when asking each node for nodestatus, it will report
each node is the current node.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 261258c1a4268230b2559bc5d8664b1197b22450)
2012-04-13 12:06:59 +10:00
Ronnie Sahlberg
7698a5105e Add test for NoIPTakeover
(This used to be ctdb commit 79172330d10ae0d5a7e5bf724959c9e5784716b4)
2012-04-12 10:31:17 +10:00