Separate flags for forcing foolscap between client and server.

integration/util.py

@@ -367,6 +367,12 @@ def _create_node(reactor, request, temp_dir, introducer_furl, flog_gatherer, nam
                 'force_foolscap',
                 str(force_foolscap),
             )
+            set_config(
+                config,
+                'client',
+                'force_foolscap',
+                str(force_foolscap),
+            )
             write_config(FilePath(config_path), config)
         created_d.addCallback(created)
 

src/allmydata/client.py

@@ -94,6 +94,7 @@ _client_config = configutil.ValidConfiguration(
             "shares.total",
             "shares._max_immutable_segment_size_for_testing",
             "storage.plugins",
+            "force_foolscap",
         ),
         "storage": (
             "debug_discard",

src/allmydata/storage_client.py

@@ -300,7 +300,7 @@ class StorageFarmBroker(service.MultiService):
         )
 
         if not self.node_config.get_config(
-                "storage", "force_foolscap", default=True, boolean=True,
+                "client", "force_foolscap", default=True, boolean=True,
         ) and len(server["ann"].get(ANONYMOUS_STORAGE_NURLS, [])) > 0:
             s = HTTPNativeStorageServer(
                 server_id,

src/allmydata/test/common_system.py

@@ -871,6 +871,7 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
 
         setnode("nickname", u"client %d \N{BLACK SMILING FACE}" % (which,))
         setconf(config, which, "storage", "force_foolscap", str(force_foolscap))
+        setconf(config, which, "client", "force_foolscap", str(force_foolscap))
 
         tub_location_hint, tub_port_endpoint = self.port_assigner.assign(reactor)
         setnode("tub.port", tub_port_endpoint)