aboutsummaryrefslogtreecommitdiff
path: root/autotests/test_kconf_update.cpp
diff options
context:
space:
mode:
authorMatthew Dawson <matthew@mjdsystems.ca>2015-02-14 01:15:55 -0500
committerMatthew Dawson <matthew@mjdsystems.ca>2015-02-14 01:15:55 -0500
commit9eee15917e01a89d937d1cba2eebbe9d65daeb72 (patch)
treed7d2310424e50815f2e287e641c2a1027550b2e1 /autotests/test_kconf_update.cpp
parent28ddbf8138c865e19e8836b49af74f9d3bc20401 (diff)
downloadkconfig-9eee15917e01a89d937d1cba2eebbe9d65daeb72.tar.gz
kconfig-9eee15917e01a89d937d1cba2eebbe9d65daeb72.tar.bz2
Revert the SIC in commit 915976c1238be811f169eab1b02f7e8dad6410e0.
On further reflection, introducing a SIC to fix the bug is not ideal. I'm working on something that will address the underlying bug, but I didn't have it in time for 5.7. The versioning behaviour is left, as I do want it to exist for the future. This only reverts the mandatory versioning of files to avoid the compatibility break. CHANGELOG: Undo 915976c123, which never saw a release, enough to avoid the SIC.
Diffstat (limited to 'autotests/test_kconf_update.cpp')
-rw-r--r--autotests/test_kconf_update.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/autotests/test_kconf_update.cpp b/autotests/test_kconf_update.cpp
index e4e2b416..ff4939a3 100644
--- a/autotests/test_kconf_update.cpp
+++ b/autotests/test_kconf_update.cpp
@@ -262,7 +262,7 @@ void TestKConfUpdate::test_data()
<< true
<< true
;
- QTest::newRow("DontMigrateWhenFileDoesntHaveVersion")
+ QTest::newRow("MigrateWhenFileDoesntHaveVersion")
<<
"File=testrc\n"
"Group=group\n"
@@ -276,12 +276,15 @@ void TestKConfUpdate::test_data()
<<
"testrc"
<<
+ "[$Version]\n"
+ "update_info=%1\n"
+ "\n"
"[group]\n"
- "old=value\n"
+ "new=value\n"
<<
""
<< false
- << false
+ << true
;
QTest::newRow("DontMigrateWhenUpdateCantDoItMissingFilename")