Further fix

Author: sumeruchat

integration-tests/run_tests_ci.sh

@@ -755,14 +755,15 @@ if [ -n "$CI" ]; then
     sleep 2
 
     # Check current route table and add default route if missing
+    # NOTE: Android emulator uses 10.0.2.1 as gateway (not 10.0.2.2)
     print_info "Checking and fixing routing table..."
     if ! adb shell "ip route show" 2>/dev/null | grep -q "default"; then
-        print_info "No default route found, adding..."
-        adb shell "ip route add default via 10.0.2.2 dev eth0" 2>/dev/null || true
+        print_info "No default route found, adding via 10.0.2.1 (emulator gateway)..."
+        adb shell "ip route add default via 10.0.2.1 dev eth0" 2>/dev/null || true
     else
-        print_info "Default route exists, replacing to use eth0..."
+        print_info "Default route exists, replacing to use eth0 via 10.0.2.1..."
         adb shell "ip route del default" 2>/dev/null || true
-        adb shell "ip route add default via 10.0.2.2 dev eth0" 2>/dev/null || true
+        adb shell "ip route add default via 10.0.2.1 dev eth0" 2>/dev/null || true
     fi
     sleep 2
 
@@ -776,11 +777,30 @@ if [ -n "$CI" ]; then
     adb shell "ip addr show eth0" 2>/dev/null || true
     adb shell "ip route show" 2>/dev/null || true
 
-    # Verify connectivity to gateway
-    if adb shell "ping -c 1 -W 2 10.0.2.2" &>/dev/null; then
-        print_success "Gateway (10.0.2.2) is reachable"
+    # Verify connectivity to gateway (10.0.2.1 is the emulator's router)
+    if adb shell "ping -c 1 -W 2 10.0.2.1" &>/dev/null; then
+        print_success "Gateway (10.0.2.1) is reachable"
+        
+        # Add default route now that gateway is confirmed reachable
+        print_info "Adding default route to routing table..."
+        adb shell "ip route add default via 10.0.2.1 dev eth0 2>&1" || true
+        sleep 1
+        
+        # Verify route was added
+        if adb shell "ip route show" | grep -q "default"; then
+            print_success "Default route added successfully"
+        else
+            print_warning "Failed to add default route"
+        fi
     else
-        print_warning "Cannot reach gateway - network may not work"
+        print_warning "Cannot reach gateway (10.0.2.1) - trying fallback 10.0.2.2..."
+        # Try 10.0.2.2 as fallback (host loopback)
+        if adb shell "ping -c 1 -W 2 10.0.2.2" &>/dev/null; then
+            print_success "Host loopback (10.0.2.2) is reachable, using as gateway"
+            adb shell "ip route add default via 10.0.2.2 dev eth0 2>&1" || true
+        else
+            print_warning "Cannot reach any gateway - network may not work"
+        fi
     fi
 
     # Manually set DNS servers if not set
@@ -805,14 +825,23 @@ if [ -n "$CI" ]; then
 
     if [ "$network_ok" = false ]; then
         print_warning "Network connectivity check failed after 15 attempts"
-        print_warning "Attempting network service restart..."
-        adb shell "svc wifi enable" 2>/dev/null || true
+        print_warning "Attempting advanced network fixes (keep wlan0 disabled)..."
+        
+        # Don't re-enable wifi - it conflicts with eth0 routing
+        # adb shell "svc wifi enable" 2>/dev/null || true
         adb shell "svc data enable" 2>/dev/null || true
+        
+        # Re-verify default route exists
+        if ! adb shell "ip route show" | grep -q "default"; then
+            print_warning "Default route missing, re-adding via 10.0.2.1..."
+            adb shell "ip route add default via 10.0.2.1 dev eth0" 2>/dev/null || true
+        fi
+        
         sleep 5
 
         # One final retry
         if adb shell "ping -c 1 -W 3 8.8.8.8" &>/dev/null; then
-            print_success "Network OK after service restart"
+            print_success "Network OK after fixes"
             network_ok=true
         else
             print_warning "Network connectivity check failed - continuing anyway"