From 391d7ee4c7327c1e303c92c9b2e1e7c1e1e2e894 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <ivan@espressif.com>
Date: Mon, 30 Sep 2019 16:26:34 +0200
Subject: [PATCH] examples/ext_flash_fatfs: print out data partitions, add CI
 test

---
 .../storage/ext_flash_fatfs/example_test.py   | 27 +++++++++++++++++++
 .../main/ext_flash_fatfs_example_main.c       | 18 +++++++++++++
 tools/ci/config/target-test.yml               |  6 +++++
 3 files changed, 51 insertions(+)
 create mode 100644 examples/storage/ext_flash_fatfs/example_test.py

diff --git a/examples/storage/ext_flash_fatfs/example_test.py b/examples/storage/ext_flash_fatfs/example_test.py
new file mode 100644
index 0000000000..a66ad8c3a4
--- /dev/null
+++ b/examples/storage/ext_flash_fatfs/example_test.py
@@ -0,0 +1,27 @@
+from __future__ import print_function
+import os
+import sys
+
+try:
+    import IDF
+except ImportError:
+    test_fw_path = os.getenv('TEST_FW_PATH')
+    if test_fw_path and test_fw_path not in sys.path:
+        sys.path.insert(0, test_fw_path)
+    import IDF
+
+
+@IDF.idf_example_test(env_tag='Example_ExtFlash')
+def test_examples_storage_ext_flash_fatfs(env, extra_data):
+    dut = env.get_dut('ext_flash_fatfs', 'examples/storage/ext_flash_fatfs')
+    dut.start_app()
+
+    dut.expect('Initialized external Flash')
+    dut.expect('partition \'nvs\'')
+    dut.expect('partition \'storage\'')
+    dut.expect('File written')
+    dut.expect('Read from file: \'Written using ESP-IDF')
+
+
+if __name__ == '__main__':
+    test_examples_storage_ext_flash_fatfs()
diff --git a/examples/storage/ext_flash_fatfs/main/ext_flash_fatfs_example_main.c b/examples/storage/ext_flash_fatfs/main/ext_flash_fatfs_example_main.c
index 7f574fe63b..a596a8119d 100644
--- a/examples/storage/ext_flash_fatfs/main/ext_flash_fatfs_example_main.c
+++ b/examples/storage/ext_flash_fatfs/main/ext_flash_fatfs_example_main.c
@@ -30,6 +30,7 @@ const char *base_path = "/extflash";
 
 static esp_flash_t* example_init_ext_flash(void);
 static const esp_partition_t* example_add_partition(esp_flash_t* ext_flash, const char* partition_label);
+static void example_list_data_partitions(void);
 static bool example_mount_fatfs(const char* partition_label);
 static void example_get_fatfs_usage(size_t* out_total_bytes, size_t* out_free_bytes);
 
@@ -45,6 +46,9 @@ void app_main(void)
     const char *partition_label = "storage";
     example_add_partition(flash, partition_label);
 
+    // List the available partitions
+    example_list_data_partitions();
+
     // Initialize FAT FS in the partition
     if (!example_mount_fatfs(partition_label)) {
         return;
@@ -139,6 +143,20 @@ static const esp_partition_t* example_add_partition(esp_flash_t* ext_flash, cons
     return fat_partition;
 }
 
+static void example_list_data_partitions(void)
+{
+    ESP_LOGI(TAG, "Listing data partitions:");
+    esp_partition_iterator_t it = esp_partition_find(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_ANY, NULL);
+
+    for (; it != NULL; it = esp_partition_next(it)) {
+        const esp_partition_t *part = esp_partition_get(it);
+        ESP_LOGI(TAG, "- partition '%s', subtype %d, offset 0x%x, size %d kB",
+        part->label, part->subtype, part->address, part->size / 1024);
+    }
+
+    esp_partition_iterator_release(it);
+}
+
 static bool example_mount_fatfs(const char* partition_label)
 {
     ESP_LOGI(TAG, "Mounting FAT filesystem");
diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index 963571cb49..587a370b7e 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -215,6 +215,12 @@ example_test_009:
   variables:
     SETUP_TOOLS: "1"
 
+example_test_010:
+  extends: .example_test_template
+  tags:
+    - ESP32
+    - Example_ExtFlash
+
 UT_001:
   extends: .unit_test_template
   parallel: 50