Merge lp://qastaging/~compiz-team/compiz/compiz.gsettings_conformance_test into lp://qastaging/compiz/0.9.8

Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.gsettings_conformance_test
Merge into: lp://qastaging/compiz/0.9.8
Prerequisite: lp://qastaging/~compiz-team/compiz/compiz.split_gsettings_rw_funcs
Diff against target: 2746 lines (+1354/-274)
19 files modified
compizconfig/gconf/src/gconf.c (+20/-11)
compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c (+140/-10)
compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h (+63/-3)
compizconfig/gsettings/src/gconf-integration.c (+5/-3)
compizconfig/gsettings/src/gsettings.c (+93/-113)
compizconfig/gsettings/src/gsettings.h (+6/-4)
compizconfig/gsettings/tests/CMakeLists.txt (+32/-2)
compizconfig/gsettings/tests/backend-conformance-config.h.in (+2/-0)
compizconfig/gsettings/tests/org.compiz.mock.gschema.xml (+50/-0)
compizconfig/gsettings/tests/test_gsettings_conformance.cpp (+431/-0)
compizconfig/gsettings/tests/test_gsettings_tests.cpp (+1/-1)
compizconfig/libcompizconfig/backend/src/ini.c (+11/-0)
compizconfig/libcompizconfig/include/ccs-backend.h (+12/-1)
compizconfig/libcompizconfig/include/ccs.h (+4/-0)
compizconfig/libcompizconfig/src/main.c (+31/-8)
compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp (+91/-8)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_backend_mock.cpp (+1/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_backend_mock.h (+7/-0)
compizconfig/tests/compizconfig_backend_concept_test.h (+354/-110)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.gsettings_conformance_test
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+114581@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2012-07-21.

Description of the change

Instantiate the GSettings backend in a test harness and run the conformance tests on it.

This is not actually needing review, I've just got it marked as Needs Review so that the CI bot will run tests on it.

To post a comment you must log in.
3338. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3339. By Sam Spilsbury

Merge

3340. By Sam Spilsbury

Correclty overload functions, remove other merge markers

3341. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3342. By Sam Spilsbury

Attach to the correct test fixture

3343. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3344. By Sam Spilsbury

Set appropriate expectaitons for gsettings backend conformance

3345. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3346. By Sam Spilsbury

Make the tests not crash

3347. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3348. By Sam Spilsbury

Make the write tests pass with a little less noise

3349. By Sam Spilsbury

Add integer expectations

3350. By Sam Spilsbury

Change mock settings so that they are always different from the
settings we change the values to in the tests

3351. By Sam Spilsbury

Provide CCSBackend to callers of translateKeyForGSettings so that we
can get the backend when we are going to register the callback

3352. By Sam Spilsbury

Hide signal connection behind interface

3353. By Sam Spilsbury

Neutralize the signal connection

3354. By Sam Spilsbury

Reduce the amount of noise when calling the write functions

3355. By Sam Spilsbury

Added float writing and reading funcs

3356. By Sam Spilsbury

Fill in the other read and write constructs, only some of the tests pass

3357. By Sam Spilsbury

Fix Bool/gboolean difference for read and write expecations

3358. By Sam Spilsbury

Fix string and match write tests, match is still being wonky...

3359. By Sam Spilsbury

Use the same GSettings object in the tests and in the backend and also
fix the color tests failing because of the lossy string conversion (simulate
this behaviour in the tests too and add a note saying that we expect it).

3360. By Sam Spilsbury

Fix key and button tests + printers

3361. By Sam Spilsbury

Fix missing break causing a test to fail

3362. By Sam Spilsbury

Fix broken ReadBellAtKey

3363. By Sam Spilsbury

Fix failing mock color test, we should simulate the toString behaviour
there too

3364. By Sam Spilsbury

Whitespace

3365. By Sam Spilsbury

We need to copy the lists and instantiate the lists a bit later
so that we don't get segfault due to a double free

3366. By Sam Spilsbury

Fix uninitialized read

3367. By Sam Spilsbury

Remove useless comment

3368. By Sam Spilsbury

Keep the setting object around for every instance of the value object.

3369. By Sam Spilsbury

Fix some spurious gmock warnings

3370. By Sam Spilsbury

Fix typo in test annotation

3371. By Sam Spilsbury

Fix unsafe array code fixing test CCSGSettingsBackendConcept/CCSBackendConformanceTestReadWrite

3372. By Sam Spilsbury

Fix bool comparison in ccsCompareLists when using multiple definitions
of TRUE and FALSE (it happens ...)

3373. By Sam Spilsbury

Added some notes as to remaining work

3374. By Sam Spilsbury

Store the initial color value list as lossy

3375. By Sam Spilsbury

Just calloc the array instead of memsetting every element and fix
color read in lists only reading into the first color

3376. By Sam Spilsbury

Remove lossy emulation, its no longer necessary now that we store
the initial values in a lossy format

3377. By Sam Spilsbury

Remove redundant comment

3378. By Sam Spilsbury

Provide the setting list type in ReadListAtKey. Make the list read tests pass

3379. By Sam Spilsbury

Fix typo in CCSGSettingsTestIndependent.TestReadVariantIsValidTypeGood

3380. By Sam Spilsbury

Ensure that variants are written to keys, now GSETTINGS_BACKEND=memory
works correctly

3381. By Sam Spilsbury

Added an updateSetting method to the backend interface, not actually used
anywhere yet

3382. By Sam Spilsbury

Added stub updateSetting definitions to the backend

3383. By Sam Spilsbury

Ini backend doesn't really have a concept of updating single settings,
but add a sensible definition in case someone wants to do it anyways

3384. By Sam Spilsbury

Added a sensible definition of updateSetting

3385. By Sam Spilsbury

Added a sensible definition of updateSetting for gsettings

3386. By Sam Spilsbury

Added test TestUpdateMockedValue

3387. By Sam Spilsbury

Added PostUpdate and PreUpdate hooks into the test fixture so now
MockCCSBackendConcept/CCSBackendConformanceTestReadWrite.TestUpdateMockedValue/*
will pass

3388. By Sam Spilsbury

Store path as a const char

3389. By Sam Spilsbury

Refactor out findSettingAndPluginToUpdateFromPath

3390. By Sam Spilsbury

Move it to gsettings_util

3391. By Sam Spilsbury

Refactor updateSettingWithGSettingsKeyName

3392. By Sam Spilsbury

Move updateSettingWithGSettingsKeyName into the util library

3393. By Sam Spilsbury

Added TestUpdateKeyedValue - all failing

3394. By Sam Spilsbury

Make the mock UpdateSettingAtKey tests pass

3395. By Sam Spilsbury

Make TestUpdateKeyedValu* pass on GSettings

3396. By Sam Spilsbury

Remove useless comment and unset evn

3397. By Sam Spilsbury

Always assume that lists are copied - fix list leak (and use smart
pointers more effectively)

3398. By Sam Spilsbury

Fix leaked path in CCSGSettingsBackendEnv::SetUp

3399. By Sam Spilsbury

Fix memory leak in readListValue in gsettings.c - we must always
provide a valid CCSSetting object otherwise ccsFreeSettingValue will not
actually free the setting value

3400. By Sam Spilsbury

Fix various memory leaks due to not unreffing some variants

3401. By Sam Spilsbury

Added debugging message

3402. By Sam Spilsbury

Put the expectation in the right place

3403. By Sam Spilsbury

Indirect the gconf client registration

3404. By Sam Spilsbury

Neuter gconf client connection

3405. By Sam Spilsbury

Lazy-register the gconf client

3406. By Sam Spilsbury

file (INSTALL ...) will respect DESTDIR by default, so no need to include
it again.

3407. By Sam Spilsbury

Fix some crashes in debian chroots

3408. By Sam Spilsbury

Make the profile general for tests

3409. By Sam Spilsbury

Added testing config backend

3410. By Sam Spilsbury

Merge lp:compiz

3411. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3412. By Sam Spilsbury

Merge

3413. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3414. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3415. By Sam Spilsbury

Merge

3416. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3417. By Sam Spilsbury

Merge

3418. By Sam Spilsbury

Added a quick TODO about the usage of sys.path

3419. By Sam Spilsbury

Just override sys.path[0] for now, need to prepend

3420. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3421. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3422. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3423. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3424. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3425. By Sam Spilsbury

Merge

3426. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3427. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3428. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3429. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3430. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3431. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3432. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3433. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3434. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3435. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3436. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3437. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3438. By Sam Spilsbury

Merge from previous. All the GSettings backend tests fail but that's fine

3439. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3440. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3441. By Sam Spilsbury

Fix crashing GSettings tests

3442. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3443. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3444. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3445. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3446. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3447. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3448. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3449. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3450. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3451. By Sam Spilsbury

Merge

3452. By Sam Spilsbury

Nuke unused function in header file

3453. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3454. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3455. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3456. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3457. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3458. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3459. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3460. By Sam Spilsbury

Merge

3461. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3462. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3463. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3464. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3465. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3466. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3467. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3468. By Sam Spilsbury

Moved CharacterWrapper definition into tests/shared/gtest_shared_characterwrapper.h

3469. By Sam Spilsbury

Merge

3470. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3471. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3472. By Sam Spilsbury

Merge

3473. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3474. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3475. By Sam Spilsbury

Fix merge marker

3476. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3477. By Sam Spilsbury

Add match-list-setting to the mock schema

3478. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3479. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3480. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3481. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3482. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3483. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3484. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3485. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3486. By Sam Spilsbury

Enable info tests for gsettigs

3487. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3488. By Sam Spilsbury

Use the much more sensible, law of demeter friendly version

3489. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3490. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3491. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3492. By Sam Spilsbury

Added expectation stubs and fix crash

3493. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3494. By Sam Spilsbury

Instantiate the tests and set the right expectations

3495. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3496. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3497. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3498. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3499. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3500. By Sam Spilsbury

Pass the object allocator too

3501. By Sam Spilsbury

First steps to getting the wrapper under test

3502. By Sam Spilsbury

Merge

3503. By Sam Spilsbury

Merge

3504. By Sam Spilsbury

Backend conformance config really belongs in gsettings

3505. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3506. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3507. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3508. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3509. By Sam Spilsbury

Update for API changes

3510. By Sam Spilsbury

Merge and remove redundant code

3511. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3512. By Sam Spilsbury

Test fixture for CCSGSettingsTestFindSettingAndPluginToUpdateFromPath

3513. By Sam Spilsbury

Comprehensive test coverage for FindSettingAndPluginToUpdateFromPath
and some cleanup, fix leaks etc

3514. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3515. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3516. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3517. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3518. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3519. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3520. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3521. By Sam Spilsbury

Added stubs for tests, fixed double unrefs due to GSettings' really
annoying stealing behaviour

3522. By Sam Spilsbury

Instantiate the CCSBackendConformanceTestProfileHandling suite for
the GSettings backend conformance test

3523. By Sam Spilsbury

Fix more double unref

3524. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3525. By Sam Spilsbury

Added AddProfile stub

3526. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3527. By Sam Spilsbury

Add default and current profiles correctly

3528. By Sam Spilsbury

Handle default and current profile cases in the tests a little better

3529. By Sam Spilsbury

Merge

3530. By Sam Spilsbury

Merge

3531. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3532. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3533. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3534. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3535. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3536. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3537. By Sam Spilsbury

Correct expectations

3538. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3539. By Sam Spilsbury

Merge

3540. By Sam Spilsbury

Fixed a set of memory leaks in the GSettings conformance tests - we must
be careful to unref the variants once they are read

3541. By Sam Spilsbury

Merge

3542. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3543. By Sam Spilsbury

Remove dupe file

3544. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3545. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3546. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3547. By Sam Spilsbury

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches