[Fusionforge-commits] r8640 - in trunk: . gforge/common/include gforge/debian gforge/debian/dsf-helper gforge/debian/patches tests/func tests/func/Site tests/func/Soap
Roland Mas
lolando at libremir.placard.fr.eu.org
Thu Jan 7 16:03:35 CET 2010
Author: lolando
Date: 2010-01-07 16:03:35 +0100 (Thu, 07 Jan 2010)
New Revision: 8640
Added:
trunk/tests/func/Soap/checks.php
Modified:
trunk/
trunk/Makefile.debian
trunk/README
trunk/gforge/common/include/database-pgsql.php
trunk/gforge/debian/README.Maintainer
trunk/gforge/debian/README.Multipack
trunk/gforge/debian/changelog
trunk/gforge/debian/control
trunk/gforge/debian/copyright
trunk/gforge/debian/dsf-helper/common-variables.templates
trunk/gforge/debian/patches/00list
trunk/gforge/debian/patches/use-nusoap-from-distro.dpatch
trunk/gforge/debian/patches/use-snoopy-from-distro.dpatch
trunk/gforge/debian/rules
trunk/tests/func/Site/AllTests.php
trunk/tests/func/Soap/AllTests.php
trunk/tests/func/Soap/login.php
trunk/tests/func/Soap/usergroup.php
trunk/tests/func/config.php.sample
Log:
Merged from 4.8: Olivier Berger's enhancements to the SOAP?\194?\160test suite
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8428,8429-8431
+ /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8428,8429-8431,8438-8441
Modified: svk:merge
- 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7838
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7784
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7797
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7799
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7811
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7826
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7827
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7828
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7839
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7951
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7958
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8108
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8145
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8216
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8226
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8250
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8337
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8357
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8371
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8375
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8379
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8415
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8431
+ 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7838
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7784
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7797
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7799
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7811
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7826
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7827
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7828
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7839
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7951
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7958
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8108
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8145
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8216
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8226
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8250
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8337
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8357
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8371
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8375
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8379
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8415
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8431
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8441
Modified: trunk/gforge/debian/changelog
===================================================================
--- trunk/gforge/debian/changelog 2010-01-07 15:03:23 UTC (rev 8639)
+++ trunk/gforge/debian/changelog 2010-01-07 15:03:35 UTC (rev 8640)
@@ -48,6 +48,7 @@
libnusoap-php instead (Closes: #529575).
* Add provides tag to control for fusionforge.
* Change default system name to FusionForge instead of GForge.
+ * Fix changelog entry for previous version adding details of CVE entry.
[ Roland Mas ]
* Fix for symlink attack (CVE-2009-3304).
Modified: trunk/tests/func/Site/AllTests.php
===================================================================
--- trunk/tests/func/Site/AllTests.php 2010-01-07 15:03:23 UTC (rev 8639)
+++ trunk/tests/func/Site/AllTests.php 2010-01-07 15:03:35 UTC (rev 8640)
@@ -77,7 +77,7 @@
}
}
-if (PHPUnit_MAIN_METHOD == 'Trackers_AllTests::main') {
+if (PHPUnit_MAIN_METHOD == 'Site_AllTests::main') {
Site_AllTests::main();
}
?>
Modified: trunk/tests/func/Soap/AllTests.php
===================================================================
--- trunk/tests/func/Soap/AllTests.php 2010-01-07 15:03:23 UTC (rev 8639)
+++ trunk/tests/func/Soap/AllTests.php 2010-01-07 15:03:35 UTC (rev 8640)
@@ -52,6 +52,7 @@
require_once 'PHPUnit/TextUI/TestRunner.php';
require_once 'func/config.php';
+require_once 'func/Soap/checks.php';
require_once 'func/Soap/login.php';
require_once 'func/Soap/usergroup.php';
@@ -66,8 +67,9 @@
{
$suite = new PHPUnit_Framework_TestSuite('PHPUnit Framework');
- $suite->addTestSuite('SoapLoginProcess');
- $suite->addTestSuite('SoapUserGroupProcess');
+ $suite->addTestSuite('SoapChecksProcess');
+ $suite->addTestSuite('SoapLoginProcess');
+ $suite->addTestSuite('SoapUserGroupProcess');
return $suite;
}
Copied: trunk/tests/func/Soap/checks.php (from rev 8441, branches/Branch_4_8/tests/func/Soap/checks.php)
===================================================================
--- trunk/tests/func/Soap/checks.php (rev 0)
+++ trunk/tests/func/Soap/checks.php 2010-01-07 15:03:35 UTC (rev 8640)
@@ -0,0 +1,56 @@
+<?php
+/*
+ * Copyright (C) 2009 Olivier Berger, Institut TELECOM
+ *
+ * This file is part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FusionForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+require_once 'PHPUnit/Framework/TestCase.php';
+
+class SoapChecksProcess extends PHPUnit_Framework_TestCase
+{
+ // Check that the SOAP API server corresponds to a hostname that
+ // resolves otherwise, phpunit fails with error code 255 on
+ // SoapClient instanciation with WSDL ... strange
+ // This assumes that upon failure, the hostname is returned instead
+ // of the IP.
+ function testHostnameResolves()
+ {
+
+ $ip = gethostbyname(FORGE_HOSTNAME);
+ $this->assertNotEquals(FORGE_HOSTNAME, $ip);
+
+ }
+
+ // This checks that the login will be able to proceed as the test
+ // environment was configured the right way
+ function testExistingUserPasswordConfigured()
+ {
+
+ $this->assertNotEquals('xxxxx', PASSWD_OF_EXISTING_USER);
+
+ }
+
+ // This checks that the WSDL URL looks fine
+ function testWSDLUrl()
+ {
+ $this->assertRegExp('/^http.?:\/\//', WSDL_URL);
+ }
+
+}
+?>
Modified: trunk/tests/func/Soap/login.php
===================================================================
--- trunk/tests/func/Soap/login.php 2010-01-07 15:03:23 UTC (rev 8639)
+++ trunk/tests/func/Soap/login.php 2010-01-07 15:03:35 UTC (rev 8640)
@@ -30,15 +30,22 @@
// print_r("setup\n");
- $this->loggedIn = FALSE;
$this->session = NULL;
- //print_r("session :".$this->session);
+ $this->soapclient = NULL;
- $this->assertRegExp('/^http.?:\/\//', WSDL_URL);
+ //try {
- // try {
+ // This is to check that the SoapClient instanciation will
+ // work. There's aparently a different behaviour if
+ // resolving the hostname doesn't work under phpunit. If
+ // this fails, the hostname and IP address should be
+ // different and the WSDL retrieval should work
+ $ip = gethostbyname(FORGE_HOSTNAME);
+ if ($ip != FORGE_HOSTNAME)
+ {
- $this->soapclient = new SoapClient(WSDL_URL,
+ // Instantiate the SOAP client with WSDL
+ $this->soapclient = new SoapClient(WSDL_URL,
array('cache_wsdl' => WSDL_CACHE_NONE,
'trace' => true));
@@ -46,115 +53,129 @@
// $fault->faultstring;
// print_r($fault);
// }
- // print_r($this->soapclient);
+ // print_r($this->soapclient);
+ }
}
- // function tearDown()
- // {
- // //
- // }
+ function tearDown()
+ {
+ if ($this->session) {
+ $response = $this->soapclient->logout($this->session);
+ // print($response);
+ }
+ }
// performs a login and returns a session "cookie"
function login($userid, $passwd)
{
+ $this->assertNotNull($this->soapclient);
+
$response = $this->soapclient->login($userid, $passwd);
if ($response) {
- $this->loggedIn = TRUE;
-
$this->session = $response;
-
// print_r($this->session);
-
}
return $response;
}
-// Name: version
-// Binding: GForgeAPIBinding
-// Input:
-// use: encoded
-// message: versionRequest
-// parts:
-// Output:
-// use: encoded
-// message: versionResponse
-// parts:
-// versionResponse: xsd:string
+ // Name: version
+ // Binding: GForgeAPIBinding
+ // Input:
+ // use: encoded
+ // message: versionRequest
+ // parts:
+ // Output:
+ // use: encoded
+ // message: versionResponse
+ // parts:
+ // versionResponse: xsd:string
function testVersion()
{
+ $this->assertNotNull($this->soapclient);
+
$version = $this->soapclient->version();
$this->assertEquals('4.8.50', $version);
}
+ /**
+ * @depends testVersion
+ */
function testGETFUNCTIONS()
{
+ $this->assertNotNull($this->soapclient);
$response = $this->soapclient->__getFunctions();
// print_r($response);
}
-// Name: login
-// Binding: GForgeAPIBinding
-// Input:
-// use: encoded
-// message: loginRequest
-// parts:
-// userid: xsd:string
-// passwd: xsd:string
-// Output:
-// use: encoded
-// message: loginResponse
-// parts:
-// loginResponse: xsd:string
+ // Name: login
+ // Binding: GForgeAPIBinding
+ // Input:
+ // use: encoded
+ // message: loginRequest
+ // parts:
+ // userid: xsd:string
+ // passwd: xsd:string
+ // Output:
+ // use: encoded
+ // message: loginResponse
+ // parts:
+ // loginResponse: xsd:string
+ /**
+ * @depends testVersion
+ */
function testLoginNonExistantUser()
{
+ $this->assertNotNull($this->soapclient);
+
$userid = 'coin';
try {
-
$response = $this->soapclient->login($userid, 'pan');
-
}
catch (SoapFault $expected) {
$this->assertEquals("Unable to log in with userid of ".$userid, $expected->faultstring);
-
- // print_r($response);
-
+ // print_r($response);
return;
}
$this->fail('An expected exception has not been raised.');
}
+ /**
+ * @depends testVersion
+ */
function testLoginWrongPwd()
{
+ $this->assertNotNull($this->soapclient);
+
$userid = EXISTING_USER;
try {
-
$response = $this->soapclient->login($userid, 'xxxxxx');
-
}
catch (SoapFault $expected) {
$this->assertEquals("Unable to log in with userid of ".$userid, $expected->faultstring);
// print_r($response);
-
return;
}
$this->fail('An expected exception has not been raised.');
}
+ /**
+ * @depends testVersion
+ */
function testLoginSuccesful()
{
$userid = EXISTING_USER;
@@ -163,22 +184,21 @@
$response = $this->login($userid, $passwd);
$this->assertNotNull($response);
-
}
-// Name: logout
-// Binding: GForgeAPIBinding
-// Input:
-// use: encoded
-// message: logoutRequest
-// parts:
-// session_ser: xsd:string
-// Output:
-// use: encoded
-// message: logoutResponse
-// parts:
-// logoutResponse: xsd:string
+ // Name: logout
+ // Binding: GForgeAPIBinding
+ // Input:
+ // use: encoded
+ // message: logoutRequest
+ // parts:
+ // session_ser: xsd:string
+ // Output:
+ // use: encoded
+ // message: logoutResponse
+ // parts:
+ // logoutResponse: xsd:string
/**
* @depends testLoginSuccesful
@@ -186,9 +206,7 @@
/* function testLogout()
{
- print_r($this->loggedIn);
- $this->assertNotNull($this->loggedIn);
$response = $this->soapclient->logout('coin');
Modified: trunk/tests/func/Soap/usergroup.php
===================================================================
--- trunk/tests/func/Soap/usergroup.php 2010-01-07 15:03:23 UTC (rev 8639)
+++ trunk/tests/func/Soap/usergroup.php 2010-01-07 15:03:35 UTC (rev 8640)
@@ -24,50 +24,53 @@
class SoapUserGroupProcess extends PHPUnit_Framework_TestCase
{
-
+
function setUp()
{
+ // print_r("setup\n");
+ $this->session = NULL;
+ $this->soapclient = NULL;
+
+ // try {
- // print_r("setup\n");
+ // see comments in SoapLoginProcess:setup() for details about this
+ $ip = gethostbyname(FORGE_HOSTNAME);
+ if ($ip != FORGE_HOSTNAME)
+ {
- $this->loggedIn = FALSE;
- $this->session = NULL;
- //print_r("session :".$this->session);
-
- $this->assertRegExp('/http.?:\/\//', WSDL_URL);
-
- // try {
-
$this->soapclient = new SoapClient(WSDL_URL,
- array('cache_wsdl' => WSDL_CACHE_NONE,
- 'trace' => true));
+ array('cache_wsdl' => WSDL_CACHE_NONE,
+ 'trace' => true));
// } catch (SoapFault $fault) {
// $fault->faultstring;
// print_r($fault);
// }
// print_r($this->soapclient);
+ }
+ }
-}
+ function tearDown()
+ {
+ if ($this->session) {
+ $response = $this->soapclient->logout($this->session);
+ // print($response);
+ }
+ }
-// function tearDown()
-// {
-// //
- // }
// performs a login and returns a session "cookie"
function login($userid, $passwd)
{
+ $this->assertNotNull($this->soapclient);
$response = $this->soapclient->login($userid, $passwd);
if ($response) {
- $this->loggedIn = TRUE;
$this->session = $response;
// print_r($this->session);
-
}
return $response;
@@ -120,10 +123,8 @@
function testGetGroupsByNameEmpty()
{
- // print_r($this->loggedIn);
+ $this->login(EXISTING_USER, PASSWD_OF_EXISTING_USER);
- $this->login(EXISTING_USER, PASSWD_OF_EXISTING_USER);
- $this->assertNotNull($this->loggedIn);
$this->assertNotNull($this->session);
try {
@@ -147,11 +148,8 @@
*/
function testGetGroupsByName()
{
+ $this->login(EXISTING_USER, PASSWD_OF_EXISTING_USER);
- // print_r($this->loggedIn);
-
- $this->login(EXISTING_USER, PASSWD_OF_EXISTING_USER);
- $this->assertNotNull($this->loggedIn);
$this->assertNotNull($this->session);
$groups = array('template' => 'template',
@@ -203,42 +201,42 @@
// return: tns:ArrayOfstring
- /**
- * @depends testLoginSuccesful
- */
- function testGetPublicProjectNamesNotLoggedIn()
- {
+ // /**
+ // * @depends testLoginSuccesful
+ // */
+ // function testGetPublicProjectNamesNotLoggedIn()
+ // {
- // print_r($this->loggedIn);
- $this->assertNotNull($this->loggedIn);
+ // // print_r($this->loggedIn);
+ // $this->assertNotNull($this->loggedIn);
- $response = $this->soapclient->getPublicProjectNames();
-
-// $this->assertContains("newsadmin", $response);
-// $this->assertContains("siteadmin", $response);
+ // $response = $this->soapclient->getPublicProjectNames();
- // print_r($response);
- }
+ // print_r($response);
+ // $this->assertContains("newsadmin", $response);
+ // $this->assertContains("siteadmin", $response);
+ // }
+
/**
* @depends testLoginSuccesful
*/
- function testGetPublicProjectNamesLoggedIn()
- {
+ // function testGetPublicProjectNamesLoggedIn()
+ // {
- $this->login(EXISTING_USER, PASSWD_OF_EXISTING_USER);
- $this->assertNotNull($this->loggedIn);
- $this->assertNotNull($this->session);
+ // $this->login(EXISTING_USER, PASSWD_OF_EXISTING_USER);
+ // $this->assertNotNull($this->loggedIn);
+ // $this->assertNotNull($this->session);
- // print_r($this->loggedIn);
- $this->assertNotNull($this->loggedIn);
+ // // print_r($this->loggedIn);
+ // $this->assertNotNull($this->loggedIn);
- $response = $this->soapclient->getPublicProjectNames($this->session);
-// $this->assertContains("newsadmin", $response);
-// $this->assertContains("siteadmin", $response);
+ // $response = $this->soapclient->getPublicProjectNames($this->session);
+ // $this->assertContains("newsadmin", $response);
+ // $this->assertContains("siteadmin", $response);
- //print_r($response);
- }
+ // //print_r($response);
+ // }
// Name: getUsers
// Binding: GForgeAPIBinding
@@ -291,11 +289,8 @@
*/
function testGetUsersByNameEmpty()
{
+ $this->login(EXISTING_USER, PASSWD_OF_EXISTING_USER);
- // print_r($this->loggedIn);
-
- $this->login(EXISTING_USER, PASSWD_OF_EXISTING_USER);
- $this->assertNotNull($this->loggedIn);
$this->assertNotNull($this->session);
try {
@@ -314,29 +309,49 @@
$this->fail('An expected exception has not been raised. Got response :'.$response);
}
+ /**
+ * @depends testLoginSuccesful
+ */
+ function testGetUsersByNameBug63()
+ {
+ $this->login(EXISTING_USER, PASSWD_OF_EXISTING_USER);
+
+ $this->assertNotNull($this->session);
+
+ // corner case, but a dangerous ? one : the way the SOAP
+ // server works allow to trick it in returning several
+ // values at a time : this one may be fixed some day and we'd then
+ $users = array('admin", "None' => array( 'count' => 2,
+ 'user_names' => array('admin', 'None')));
+
+ foreach (array_keys($users) as $user_name) {
+ $response = $this->soapclient->getUsersByName($this->session,array($user_name));
+
+ $this->assertEquals($users[$user_name]['count'], count($response));
+
+ foreach ($response as $user) {
+ // print_r($user);
+ $this->assertContains($user->user_name, $users[$user_name]['user_names']);
+ }
+ }
+ }
+
/**
* @depends testLoginSuccesful
*/
function testGetUsersByName()
{
+ $this->login(EXISTING_USER, PASSWD_OF_EXISTING_USER);
- // print_r($this->loggedIn);
-
- $this->login(EXISTING_USER, PASSWD_OF_EXISTING_USER);
- $this->assertNotNull($this->loggedIn);
$this->assertNotNull($this->session);
$users = array('admin'=>'admin',
- 'None'=>'None',
- EXISTING_USER => EXISTING_USER);
+ 'None'=>'None',
+ EXISTING_USER => EXISTING_USER);
foreach (array_keys($users) as $user_name) {
// print_r($user_name);
- // $user_name='admin';
$response = $this->soapclient->getUsersByName($this->session,array($user_name));
- // $response = $this->soapclient->__soapCall('getUsersByName',
- // array('session_ser' => $this->session,
- // 'user_ids' => array('admin')));
$user = $response[0];
// print_r($user);
Modified: trunk/tests/func/config.php.sample
===================================================================
--- trunk/tests/func/config.php.sample 2010-01-07 15:03:23 UTC (rev 8639)
+++ trunk/tests/func/config.php.sample 2010-01-07 15:03:35 UTC (rev 8640)
@@ -13,8 +13,8 @@
// Host where selenium-rc is running
define ('SELENIUM_RC_HOST', 'localhost');
-// URL to access the application
-define ('URL', 'http://test.local/');
+// The forge's hostname
+define ('FORGE_HOSTNAME', 'test.local');
// Base URL where FusionForge is installed
define ('BASE', '');
@@ -26,13 +26,23 @@
define('DB_PASSWORD', '@@FFDB_PASS@@');
define('DB_INIT_CMD', 'php '.dirname(__FILE__).'/db_reload.php');
-define ('WSDL_URL', URL.'soap/index.php?wsdl');
-
// this should be an existing user of the forge together with its password
// (the password should be different from 'xxxxxx')
define ('EXISTING_USER', 'admin');
-define ('PASSWD_OF_EXISTING_USER', 'myadmin');
+define ('PASSWD_OF_EXISTING_USER', 'xxxxx');
// Enter true when file is configured.
define('CONFIGURED', false);
+
+//
+// DON'T MODIFY BELOW THIS LINE UNLESS YOU KNOW WHAT YOU DO
+//
+
+// These are deduced from the previous definitions.
+
+// URL to access the application
+define ('URL', 'http://'.FORGE_HOSTNAME.'/');
+
+// WSDL of the forges SOAP API
+define ('WSDL_URL', URL.'soap/index.php?wsdl');
?>
More information about the Fusionforge-commits
mailing list