[EFL] appcache tests are flaky

https://bugs.webkit.org/show_bug.cgi?id=86619

Patch by Christophe Dumez <christophe.dumez@intel.com> on 2012-05-18
Reviewed by Ryosuke Niwa.

Source/WebKit/efl:

No longer set the application cache path in ewk_main since the
path can only be set once and this prevents DRT (or apps) to set
it. Update the ewk_settings documentation to reflect these
changes.

* ewk/ewk_main.cpp:
(_ewk_init_body):
* ewk/ewk_settings.h:

Tools:

Correctly set the application cache database path in EFL's
DumpRenderTree initialization code.

* DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
(DumpRenderTreeChrome::initialize):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@117552 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
index d151b71..5d3599c 100644 (file)
--- a/Source/WebKit/efl/ChangeLog
+++ b/Source/WebKit/efl/ChangeLog
@@ -1,5 +1,21 @@
 2012-05-18  Christophe Dumez  <christophe.dumez@intel.com>
 
+        [EFL] appcache tests are flaky
+        https://bugs.webkit.org/show_bug.cgi?id=86619
+
+        Reviewed by Ryosuke Niwa.
+
+        No longer set the application cache path in ewk_main since the 
+        path can only be set once and this prevents DRT (or apps) to set
+        it. Update the ewk_settings documentation to reflect these 
+        changes.
+
+        * ewk/ewk_main.cpp:
+        (_ewk_init_body):
+        * ewk/ewk_settings.h:
+
+2012-05-18  Christophe Dumez  <christophe.dumez@intel.com>
+
         [EFL] Add simple implementation of Web Intents
         https://bugs.webkit.org/show_bug.cgi?id=86354
 

diff --git a/Source/WebKit/efl/ewk/ewk_main.cpp b/Source/WebKit/efl/ewk/ewk_main.cpp
index d9be587..8a0dd66 100644 (file)
--- a/Source/WebKit/efl/ewk/ewk_main.cpp
+++ b/Source/WebKit/efl/ewk/ewk_main.cpp
@@ -165,10 +165,8 @@ Eina_Bool _ewk_init_body(void)
     }
 
     WTF::String webkitDirectory = home + "/.webkit";
-    if (WebCore::makeAllDirectories(webkitDirectory)) {
+    if (WebCore::makeAllDirectories(webkitDirectory))
         ewk_settings_web_database_path_set(webkitDirectory.utf8().data());
-        ewk_settings_application_cache_path_set(webkitDirectory.utf8().data());
-    }
 
     ewk_network_tls_certificate_check_set(false);
 

diff --git a/Source/WebKit/efl/ewk/ewk_settings.h b/Source/WebKit/efl/ewk/ewk_settings.h
index 6fad106..e3a1047 100644 (file)
--- a/Source/WebKit/efl/ewk/ewk_settings.h
+++ b/Source/WebKit/efl/ewk/ewk_settings.h
@@ -196,7 +196,8 @@ EAPI Evas_Object     *ewk_settings_icon_database_icon_object_get(const char *url
  * The Offline Application Caching APIs are part of HTML5 and allow applications to store data locally that is accessed
  * when the network cannot be reached.
  *
- * By default, the path is @c ~/.webkit.
+ * By default, the path is @c NULL, indicating that the feature is disabled. Once the path is set, the feature is enabled
+ * and the path cannot be changed.
  *
  * @param path where to store cache, must be write-able.
  *
@@ -210,7 +211,7 @@ EAPI void             ewk_settings_application_cache_path_set(const char *path);
  * The Offline Application Caching APIs are part of HTML5 and allow applications to store data locally that is accessed
  * when the network cannot be reached.
  *
- * By default, the path is @c ~/.webkit.
+ * By default, the path is @c NULL, indicating that the feature is disabled.
  *
  * @return eina_stringshare'd path value.
  *

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c49d299..ddf5fab 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2012-05-18  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] appcache tests are flaky
+        https://bugs.webkit.org/show_bug.cgi?id=86619
+
+        Reviewed by Ryosuke Niwa.
+
+        Correctly set the application cache database path in EFL's
+        DumpRenderTree initialization code.
+
+        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+        (DumpRenderTreeChrome::initialize):
+
 2012-05-17  Raphael Kubo da Costa  <rakuco@webkit.org>
 
         [EFL][DRT] Call resetInternalsObject() after each test.

diff --git a/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp b/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
index a11ad5a..4d458e4 100644 (file)
--- a/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
+++ b/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
@@ -162,6 +162,8 @@ bool DumpRenderTreeChrome::initialize()
         ewk_settings_local_storage_path_set(path);
         eina_str_join(path, sizeof(path), '/', drtTemp, "Databases");
         ewk_settings_web_database_path_set(path);
+        eina_str_join(path, sizeof(path), '/', drtTemp, "Applications");
+        ewk_settings_application_cache_path_set(path);
     }
 
     return true;